← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Monty Taylor
  • Date: 2009-12-23 08:01:21 UTC
  • mto: This revision was merged to the branch mainline in revision 1253.
  • Revision ID: mordred@inaugust.com-20091223080121-iveugdrewkp7iqyi
Oy. Bigger change than I normally like - but this stuff is all intertwined.
Moved a bunch of things to public drizzled/ area. Split some files. Made some
convenience libs. EVENTUALLY, some of this will be able to be re-factored, but
for now I'm ok with erring on the side of too many files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
293
293
    }
294
294
    if ((file=my_open(name,O_RDONLY,MYF(MY_WME))) < 0)
295
295
    {
296
 
      my_error(ER_CANT_OPEN_FILE, MYF(0), name, my_errno);
 
296
      my_error(ER_CANT_OPEN_FILE, MYF(0), name, errno);
297
297
      return(true);
298
298
    }
299
299
  }
361
361
                            *enclosed, skip_lines, ignore);
362
362
    if (table->cursor->ha_end_bulk_insert() && !error)
363
363
    {
364
 
      table->print_error(my_errno, MYF(0));
 
364
      table->print_error(errno, MYF(0));
365
365
      error= 1;
366
366
    }
367
367
    table->cursor->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);