← Back to branch summary

~eday/drizzle/eday-dev

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Eric Day
  • Date: 2010-01-07 20:02:38 UTC
  • mfrom: (971.3.291 staging)
  • Revision ID: eday@oddments.org-20100107200238-uqw8v6kv9pl7nny5
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
16
16
 
17
17
/* Insert of records */
18
18
 
19
 
#include <drizzled/server_includes.h>
 
19
#include "config.h"
20
20
#include <drizzled/sql_select.h>
21
21
#include <drizzled/show.h>
22
22
#include <drizzled/error.h>
26
26
#include <drizzled/sql_load.h>
27
27
#include <drizzled/field/timestamp.h>
28
28
#include <drizzled/lock.h>
 
29
#include "drizzled/sql_table.h"
 
30
#include "drizzled/pthread_globals.h"
29
31
 
30
32
using namespace drizzled;
31
33
 
 
34
extern plugin::StorageEngine *heap_engine;
 
35
extern plugin::StorageEngine *myisam_engine;
 
36
 
32
37
/*
33
38
  Check if insert fields are correct.
34
39
 
397
402
    table->cursor->ha_release_auto_increment();
398
403
    if (table->cursor->ha_end_bulk_insert() && !error)
399
404
    {
400
 
      table->print_error(my_errno,MYF(0));
 
405
      table->print_error(errno,MYF(0));
401
406
      error=1;
402
407
    }
403
408
    if (duplic != DUP_ERROR || ignore)
768
773
      {
769
774
        if (table->cursor->extra(HA_EXTRA_FLUSH_CACHE)) /* Not needed with NISAM */
770
775
        {
771
 
          error=my_errno;
 
776
          error=errno;
772
777
          goto err;
773
778
        }
774
779
 
1784
1789
  }
1785
1790
}
1786
1791
 
1787
 
 
1788
 
/*****************************************************************************
1789
 
  Instansiate templates
1790
 
*****************************************************************************/
1791
 
 
1792
 
#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
1793
 
template class List_iterator_fast<List_item>;
1794
 
#endif /* HAVE_EXPLICIT_TEMPLATE_INSTANTIATION */