← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_table.cc

  • Committer: Monty Taylor
  • Date: 2011-04-06 21:23:45 UTC
  • mfrom: (2268.1.4 build)
  • Revision ID: mordred@inaugust.com-20110406212345-a7w7nkcuq60ybi4z
Merge Monty: Windows Fixes
Merge Olaf: open_table refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_table.cc
181
181
  else
182
182
  {
183
183
    identifier::Table catch22(first_table->getSchemaName(), first_table->getTableName());
184
 
    Table *table= session().find_temporary_table(catch22);
 
184
    Table *table= session().open_tables.find_temporary_table(catch22);
185
185
    assert(table);
186
186
    {
187
187
      identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName(), table->getMutableShare()->getPath());
841
841
    if (original_table_identifier.isTmp())
842
842
    {
843
843
 
844
 
      if (session.find_temporary_table(new_table_identifier))
 
844
      if (session.open_tables.find_temporary_table(new_table_identifier))
845
845
      {
846
846
        my_error(ER_TABLE_EXISTS_ERROR, new_table_identifier);
847
847
        return false;
1162
1162
      if (new_table)
1163
1163
      {
1164
1164
        /* close_temporary_table() frees the new_table pointer. */
1165
 
        session->close_temporary_table(new_table);
 
1165
        session->open_tables.close_temporary_table(new_table);
1166
1166
      }
1167
1167
      else
1168
1168
      {
1199
1199
  else if (original_table_identifier.isTmp())
1200
1200
  {
1201
1201
    /* Close lock if this is a transactional table */
1202
 
    if (session->lock)
 
1202
    if (session->open_tables.lock)
1203
1203
    {
1204
 
      session->unlockTables(session->lock);
1205
 
      session->lock= 0;
 
1204
      session->unlockTables(session->open_tables.lock);
 
1205
      session->open_tables.lock= 0;
1206
1206
    }
1207
1207
 
1208
1208
    /* Remove link to old table and rename the new one */
1209
 
    session->close_temporary_table(table);
 
1209
    session->open_tables.close_temporary_table(table);
1210
1210
 
1211
1211
    /* Should pass the 'new_name' as we store table name in the cache */
1212
1212
    new_table->getMutableShare()->setIdentifier(new_table_identifier);