← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2010-10-15 01:23:36 UTC
  • mfrom: (1835.1.7 staging)
  • Revision ID: brian@tangent.org-20101015012336-8w5lox9kj0hkv0a1
Merge in mutable/execute

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
1419
1419
  if (session->is_fatal_error)                          // If end of memory
1420
1420
    goto err;
1421
1421
  table->getMutableShare()->db_record_offset= 1;
1422
 
  if (table->getMutableShare()->db_type() == myisam_engine)
 
1422
  if (table->getShare()->db_type() == myisam_engine)
1423
1423
  {
1424
1424
    if (table->create_myisam_tmp_table(param->keyinfo, param->start_recinfo,
1425
1425
                                       &param->recinfo, select_options))
1732
1732
    }
1733
1733
 
1734
1734
    TableIdentifier identifier(getShare()->getSchemaName(), getShare()->getTableName(), getShare()->getTableName());
1735
 
    getMutableShare()->db_type()->doDropTable(*session, identifier);
 
1735
    getShare()->getEngine()->doDropTable(*session, identifier);
1736
1736
 
1737
1737
    delete cursor;
1738
1738
  }