← Back to branch summary

~stewart/drizzle/embedded-innodb-rnd-read

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Stewart Smith
  • Date: 2010-04-01 04:50:06 UTC
  • mfrom: (1310.1.40)
  • Revision ID: stewart@flamingspork.com-20100401045006-z537qbrw1ojt6jdb
Merged embedded-innodb-write-row into embedded-innodb-rnd-read.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
308
308
  info.handle_duplicates=handle_duplicates;
309
309
  info.escape_char=escaped->length() ? (*escaped)[0] : INT_MAX;
310
310
 
 
311
  SchemaIdentifier identifier(session->db);
311
312
  READ_INFO read_info(file, tot_length,
312
 
                      ex->cs ? ex->cs : plugin::StorageEngine::getSchemaCollation(session->db.c_str()),
313
 
                      *field_term,*ex->line_start, *ex->line_term, *enclosed,
 
313
                      ex->cs ? ex->cs : plugin::StorageEngine::getSchemaCollation(identifier),
 
314
                      *field_term, *ex->line_start, *ex->line_term, *enclosed,
314
315
                      info.escape_char, is_fifo);
315
316
  if (read_info.error)
316
317
  {