← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Stewart Smith
  • Date: 2009-06-04 07:08:43 UTC
  • mto: This revision was merged to the branch mainline in revision 1053.
  • Revision ID: stewart@flamingspork.com-20090604070843-4idap2o27btgfypc
remove handler::ha_delete_table and have StorageEngine::deleteTable instead

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
3261
3261
bool rm_temporary_table(StorageEngine *base, char *path)
3262
3262
{
3263
3263
  bool error=0;
3264
 
  handler *file;
 
3264
 
 
3265
  assert(base);
3265
3266
 
3266
3267
  if(delete_table_proto_file(path))
3267
3268
    error=1; /* purecov: inspected */
3268
3269
 
3269
 
  file= get_new_handler((TableShare*) 0, current_session->mem_root, base);
3270
 
  if (file && file->ha_delete_table(path))
 
3270
  if (base->deleteTable(current_session, path))
3271
3271
  {
3272
3272
    error=1;
3273
3273
    errmsg_printf(ERRMSG_LVL_WARN, _("Could not remove temporary table: '%s', error: %d"),
3274
3274
                  path, my_errno);
3275
3275
  }
3276
 
  delete file;
3277
3276
  return(error);
3278
3277
}
3279
3278
 
5552
5551
        if (!memcmp(".dfe", ext, ext_len))
5553
5552
        {
5554
5553
          TableShare share;
5555
 
          handler *handler_file= 0;
5556
5554
          /* We should cut file extention before deleting of table */
5557
5555
          memcpy(filePathCopy, filePath, filePath_len - ext_len);
5558
5556
          filePathCopy[filePath_len - ext_len]= 0;
5559
5557
          share.init(NULL, filePathCopy);
5560
 
          if (!open_table_def(session, &share) &&
5561
 
              ((handler_file= get_new_handler(&share, session->mem_root,
5562
 
                                              share.db_type()))))
 
5558
          if (!open_table_def(session, &share))
5563
5559
          {
5564
 
            handler_file->ha_delete_table(filePathCopy);
5565
 
            delete handler_file;
 
5560
            share.db_type()->deleteTable(session, filePathCopy);
5566
5561
          }
5567
5562
          share.free_table_share();
5568
5563
        }