← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Brian Aker
  • Date: 2010-10-23 22:28:30 UTC
  • mto: This revision was merged to the branch mainline in revision 1875.
  • Revision ID: brian@tangent.org-20101023222830-em4idhbau96l37zt
Encapsulate schema_name it table_list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
130
130
  String *field_term=ex->field_term,*escaped=ex->escaped;
131
131
  String *enclosed=ex->enclosed;
132
132
  bool is_fifo=0;
133
 
  char *db= table_list->db;                     // This is never null
134
 
  assert(db);
 
133
 
 
134
  assert(table_list->getSchemaName()); // This should never be null
 
135
 
135
136
  /*
136
137
    If path for cursor is not defined, we will use the current database.
137
138
    If this is not set, we will use the directory where the table to be
138
139
    loaded is located
139
140
  */
140
 
  const char *tdb= session->db.empty() ? db  : session->db.c_str();             // Result is never null
 
141
  const char *tdb= session->db.empty() ? table_list->getSchemaName()  : session->db.c_str();            // Result is never null
141
142
  assert(tdb);
142
143
  uint32_t skip_lines= ex->skip_lines;
143
144
  bool transactional_table;