← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2010-06-28 16:57:19 UTC
  • mfrom: (1637.2.9 convert-TableList)
  • Revision ID: brian@gaz-20100628165719-rpgaxo0hk055r5ct
Merge in VJ

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
183
183
  {
184
184
    TableIdentifier identifier(table->db, table->table_name);
185
185
    TableShare *share;
186
 
    table->db_type= NULL;
 
186
    table->setDbType(NULL);
187
187
 
188
188
    if ((share= TableShare::getShare(identifier)))
189
189
    {
190
 
      table->db_type= share->db_type();
 
190
      table->setDbType(share->db_type());
191
191
    }
192
192
  }
193
193
 
239
239
        goto err_with_placeholders;
240
240
      }
241
241
    }
242
 
    TableIdentifier identifier(db, table->table_name, table->internal_tmp_table ? message::Table::INTERNAL : message::Table::STANDARD);
 
242
    TableIdentifier identifier(db, table->table_name, table->getInternalTmpTable() ? message::Table::INTERNAL : message::Table::STANDARD);
243
243
 
244
244
    if (drop_temporary || not plugin::StorageEngine::doesTableExist(*session, identifier))
245
245
    {