← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/db.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/db.cc
371
371
 
372
372
  for (table= tables; table; table= table->next_local)
373
373
  {
374
 
    char *db=table->db;
375
 
    TableIdentifier identifier(table->db, table->table_name);
 
374
    const char *db=table->getSchemaName();
 
375
    TableIdentifier identifier(table->getSchemaName(), table->table_name);
376
376
 
377
377
    plugin::StorageEngine *table_type;
378
378
 
514
514
    if (not table_list)
515
515
      return -1;
516
516
 
517
 
    table_list->db= (char*) (table_list+1);
518
 
    table_list->table_name= strcpy(table_list->db, schema_identifier.getSchemaName().c_str()) + db_len + 1;
 
517
    table_list->setSchemaName((char*) (table_list+1));
 
518
    table_list->table_name= strcpy((char*) (table_list+1), schema_identifier.getSchemaName().c_str()) + db_len + 1;
519
519
    TableIdentifier::filename_to_tablename((*it).getTableName().c_str(), table_list->table_name, (*it).getTableName().size() + 1);
520
520
    table_list->alias= table_list->table_name;  // If lower_case_table_names=2
521
521
    table_list->setInternalTmpTable((strncmp((*it).getTableName().c_str(),