← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Olaf van der Spek
  • Date: 2011-04-05 12:26:58 UTC
  • mto: (2278.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2272.
  • Revision ID: olafvdspek@gmail.com-20110405122658-xxrvmobwwwwf3oct
Refactor Open_tables_state

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
138
138
    {
139
139
      identifier::Table tmp_identifier(table->getSchemaName(), table->getTableName());
140
140
 
141
 
      error= session->open_tables.drop_temporary_table(tmp_identifier);
 
141
      error= session->drop_temporary_table(tmp_identifier);
142
142
 
143
143
      switch (error) {
144
144
      case  0:
1365
1365
    /* Open table and put in temporary table list */
1366
1366
    if (not (session->open_temporary_table(identifier)))
1367
1367
    {
1368
 
      (void) session->open_tables.rm_temporary_table(identifier);
 
1368
      (void) session->rm_temporary_table(identifier);
1369
1369
      return error;
1370
1370
    }
1371
1371
  }
2089
2089
                                             is_engine_set);
2090
2090
      if (not was_created) // This is pretty paranoid, but we assume something might not clean up after itself
2091
2091
      {
2092
 
        (void) session->open_tables.rm_temporary_table(destination_identifier, true);
 
2092
        (void) session->rm_temporary_table(destination_identifier, true);
2093
2093
      }
2094
2094
      else if (not session->open_temporary_table(destination_identifier))
2095
2095
      {
2096
2096
        // We created, but we can't open... also, a hack.
2097
 
        (void) session->open_tables.rm_temporary_table(destination_identifier, true);
 
2097
        (void) session->rm_temporary_table(destination_identifier, true);
2098
2098
      }
2099
2099
      else
2100
2100
      {