← Back to branch summary

~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-187

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Stewart Smith
  • Date: 2012-07-11 14:06:00 UTC
  • mto: This revision was merged to the branch mainline in revision 2574.
  • Revision ID: stewart@flamingspork.com-20120711140600-oxrs1cjabjuqpd05
force a identifier::Schema to be constructed with a identifier::Catalog. This is close to the final 'big' part for CATALOG support. We also have to modify all around the server that creates identifier::Schema so it does so properly. Since a single Session cannot span schemas, we get off a wee bit easy :) The big limitation in this patch is that INFORMATION_SCHEMA and DATA_DICTIONARY only appear in the LOCAL catalog (and this really needs to be fixed before CATALOGs other than LOCAL are supported).

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,