← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Lee Bieber
  • Date: 2011-04-13 18:54:56 UTC
  • mfrom: (2275.1.2 build)
  • Revision ID: kalebral@gmail.com-20110413185456-ygv8a7lxf92ttoee
Merge Joe - 755201: slave plugin queryForReplicationEvents() query needs to be ordered
Merge Olaf - Refactor Session

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
144
144
    If this is not set, we will use the directory where the table to be
145
145
    loaded is located
146
146
  */
147
 
  util::string::const_shared_ptr schema(session->schema());
 
147
  util::string::ptr schema(session->schema());
148
148
  const char *tdb= (schema and not schema->empty()) ? schema->c_str() : table_list->getSchemaName(); // Result should never be null
149
149
  assert(tdb);
150
150
  uint32_t skip_lines= ex->skip_lines;