← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
23
23
#include <drizzled/session.h>
24
24
#include <drizzled/sql_base.h>
25
25
#include <drizzled/field/timestamp.h>
 
26
#include "drizzled/internal/my_sys.h"
 
27
#include "drizzled/internal/iocache.h"
26
28
#include <drizzled/db.h>
27
29
 
28
30
#include <sys/stat.h>
293
295
    }
294
296
    if ((file=my_open(name,O_RDONLY,MYF(MY_WME))) < 0)
295
297
    {
296
 
      my_error(ER_CANT_OPEN_FILE, MYF(0), name, my_errno);
 
298
      my_error(ER_CANT_OPEN_FILE, MYF(0), name, errno);
297
299
      return(true);
298
300
    }
299
301
  }
361
363
                            *enclosed, skip_lines, ignore);
362
364
    if (table->cursor->ha_end_bulk_insert() && !error)
363
365
    {
364
 
      table->print_error(my_errno, MYF(0));
 
366
      table->print_error(errno, MYF(0));
365
367
      error= 1;
366
368
    }
367
369
    table->cursor->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);