← Back to branch summary

~posulliv/drizzle/schema-less

« back to all changes in this revision

Viewing changes to drizzled/db.cc

  • Committer: Brian Aker
  • Date: 2010-03-02 07:03:12 UTC
  • mfrom: (1309.2.10 drizzle-build)
  • Revision ID: brian@gaz-20100302070312-u8xyk09u2970pgzp
Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/db.cc
412
412
 
413
413
    TableIdentifier identifier(db, table->table_name, table->internal_tmp_table ? INTERNAL_TMP_TABLE : NO_TMP_TABLE);
414
414
 
415
 
    if ((table_type == NULL
416
 
          && (plugin::StorageEngine::getTableDefinition(*session,
417
 
                                                        identifier) != EEXIST)))
 
415
    if (table_type == NULL && not plugin::StorageEngine::doesTableExist(*session, identifier))
418
416
    {
419
417
      // Table was not found on disk and table can't be created from engine
420
418
      push_warning_printf(session, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
423
421
    }
424
422
    else
425
423
    {
426
 
      error= plugin::StorageEngine::dropTable(*session,
427
 
                                              identifier,
428
 
                                              false);
 
424
      error= plugin::StorageEngine::dropTable(*session, identifier);
429
425
 
430
426
      if ((error == ENOENT || error == HA_ERR_NO_SUCH_TABLE))
431
427
      {