← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/singular.cc

  • Committer: Olaf van der Spek
  • Date: 2011-08-08 12:51:19 UTC
  • mto: This revision was merged to the branch mainline in revision 2396.
  • Revision ID: olafvdspek@gmail.com-20110808125119-qcrkgv0frmxk03rn
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/singular.cc
126
126
 
127
127
bool Singular::open_tmp_table()
128
128
{
129
 
  int error;
130
 
  
131
129
  identifier::Table identifier(getShare()->getSchemaName(), getShare()->getTableName(), getShare()->getPath());
132
 
  if ((error=cursor->ha_open(identifier,
133
 
                             O_RDWR,
134
 
                             HA_OPEN_TMP_TABLE | HA_OPEN_INTERNAL_TABLE)))
 
130
  if (int error= cursor->ha_open(identifier, O_RDWR, HA_OPEN_TMP_TABLE | HA_OPEN_INTERNAL_TABLE))
135
131
  {
136
132
    print_error(error, MYF(0));
137
133
    db_stat= 0;
303
299
  if (cursor)
304
300
  {
305
301
    if (db_stat)
306
 
    {
307
 
      cursor->closeMarkForDelete(getShare()->getTableName());
308
 
    }
 
302
      cursor->closeMarkForDelete();
309
303
 
310
304
    identifier::Table identifier(getShare()->getSchemaName(), getShare()->getTableName(), getShare()->getTableName());
311
305
    drizzled::error_t ignored;
312
 
    plugin::StorageEngine::dropTable(*in_use,
313
 
                                     *getShare()->getEngine(),
314
 
                                     identifier,
315
 
                                     ignored);
316
 
 
 
306
    plugin::StorageEngine::dropTable(*in_use, *getShare()->getEngine(), identifier, ignored);
317
307
    delete cursor;
318
308
  }
319
309
 
328
318
  in_use->set_proc_info(save_proc_info);
329
319
}
330
320
 
331
 
 
332
321
} /* namespace table */
333
322
} /* namespace drizzled */