← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

Merge Name changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
1320
1320
                                   table_list->db, table_list->table_name,
1321
1321
                                   false);
1322
1322
 
1323
 
      if (plugin::StorageEngine::getTableProto(path, NULL) != EEXIST)
 
1323
      if (plugin::StorageEngine::getTableDefinition(path, NULL) != EEXIST)
1324
1324
      {
1325
1325
        /*
1326
1326
          Table to be created, so we need to create placeholder in table-cache.
4576
4576
        share.init(NULL, filePathCopy);
4577
4577
        if (!open_table_def(session, &share))
4578
4578
        {
4579
 
          share.db_type()->doDeleteTable(session, filePathCopy);
 
4579
          share.db_type()->doDropTable(session, filePathCopy);
4580
4580
        }
4581
4581
        share.free_table_share();
4582
4582
      }