← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2009-06-05 18:49:23 UTC
  • mfrom: (1039.3.19 handler-cleanup)
  • Revision ID: brian@gaz-20090605184923-36mbxlsxkocuco1w
Merge Stewart, fix LOCK (it was dead, only for dead RENAME SCHEMA code), and
fixed Sun Studio failure.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
3148
3148
bool rm_temporary_table(StorageEngine *base, char *path)
3149
3149
{
3150
3150
  bool error=0;
3151
 
  handler *file;
 
3151
 
 
3152
  assert(base);
3152
3153
 
3153
3154
  if(delete_table_proto_file(path))
3154
3155
    error=1; /* purecov: inspected */
3155
3156
 
3156
 
  file= get_new_handler((TableShare*) 0, current_session->mem_root, base);
3157
 
  if (file && file->ha_delete_table(path))
 
3157
  if (base->deleteTable(current_session, path))
3158
3158
  {
3159
3159
    error=1;
3160
3160
    errmsg_printf(ERRMSG_LVL_WARN, _("Could not remove temporary table: '%s', error: %d"),
3161
3161
                  path, my_errno);
3162
3162
  }
3163
 
  delete file;
3164
3163
  return(error);
3165
3164
}
3166
3165
 
5439
5438
        if (!memcmp(".dfe", ext, ext_len))
5440
5439
        {
5441
5440
          TableShare share;
5442
 
          handler *handler_file= 0;
5443
5441
          /* We should cut file extention before deleting of table */
5444
5442
          memcpy(filePathCopy, filePath, filePath_len - ext_len);
5445
5443
          filePathCopy[filePath_len - ext_len]= 0;
5446
5444
          share.init(NULL, filePathCopy);
5447
 
          if (!open_table_def(session, &share) &&
5448
 
              ((handler_file= get_new_handler(&share, session->mem_root,
5449
 
                                              share.db_type()))))
 
5445
          if (!open_table_def(session, &share))
5450
5446
          {
5451
 
            handler_file->ha_delete_table(filePathCopy);
5452
 
            delete handler_file;
 
5447
            share.db_type()->deleteTable(session, filePathCopy);
5453
5448
          }
5454
5449
          share.free_table_share();
5455
5450
        }