← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/ha_heap.cc

  • Committer: Brian Aker
  • Date: 2010-03-19 00:16:13 UTC
  • mfrom: (1358.1.5 build)
  • Revision ID: brian@gaz-20100319001613-00rqrgybz9xxyssp
Merge more cleanup from TableIdentifier.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/ha_heap.cc
81
81
 
82
82
  int doRenameTable(Session*, const char * from, const char * to);
83
83
 
84
 
  int doDropTable(Session&, TableIdentifier &identifier,
85
 
                  const string &table_path);
 
84
  int doDropTable(Session&, TableIdentifier &identifier);
86
85
 
87
86
  int doGetTableDefinition(Session& session,
88
87
                           const char* path,
138
137
  We have to ignore ENOENT entries as the MEMORY table is created on open and
139
138
  not when doing a CREATE on the table.
140
139
*/
141
 
int HeapEngine::doDropTable(Session&, TableIdentifier &, const string &table_path)
 
140
int HeapEngine::doDropTable(Session&, TableIdentifier &identifier)
142
141
{
143
142
  ProtoCache::iterator iter;
144
143
 
145
144
  pthread_mutex_lock(&proto_cache_mutex);
146
 
  iter= proto_cache.find(table_path.c_str());
 
145
  iter= proto_cache.find(identifier.getPath());
147
146
 
148
147
  if (iter!= proto_cache.end())
149
148
    proto_cache.erase(iter);
150
149
  pthread_mutex_unlock(&proto_cache_mutex);
151
150
 
152
 
  return heap_delete_table(table_path.c_str());
 
151
  return heap_delete_table(identifier.getPath());
153
152
}
154
153
 
155
154
static HeapEngine *heap_storage_engine= NULL;