← Back to branch summary

~ubuntu-branches/ubuntu/vivid/drizzle/vivid-proposed

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Package Import Robot
  • Author(s): Tobias Frost
  • Date: 2013-08-22 20:18:31 UTC
  • mto: (20.1.1 sid)
  • mto: This revision was merged to the branch mainline in revision 21.
  • Revision ID: package-import@ubuntu.com-20130822201831-gn3ozsh7o7wmc5tk
Tags: upstream-7.2.3
Import upstream version 7.2.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
325
325
  info.handle_duplicates=handle_duplicates;
326
326
  info.escape_char=escaped->length() ? (*escaped)[0] : INT_MAX;
327
327
 
328
 
  identifier::Schema identifier(*schema);
 
328
  identifier::Schema identifier(session->catalog().identifier(),
 
329
                                *schema);
329
330
  READ_INFO read_info(file, tot_length,
330
331
                      ex->cs ? ex->cs : plugin::StorageEngine::getSchemaCollation(identifier),
331
332
                      *field_term, *ex->line_start, *ex->line_term, *enclosed,