← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/db.cc

  • Committer: Brian Aker
  • Date: 2010-10-22 22:02:32 UTC
  • mfrom: (1864.3.17 catalogs)
  • Revision ID: brian@tangent.org-20101022220232-p4l1i9a3ud5asw0d
Merge in Brian. key creation should be improved after this (ie for share)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/db.cc
372
372
  for (table= tables; table; table= table->next_local)
373
373
  {
374
374
    char *db=table->db;
 
375
    TableIdentifier identifier(table->db, table->table_name);
 
376
 
375
377
    plugin::StorageEngine *table_type;
376
378
 
377
 
    error= session->drop_temporary_table(table);
 
379
    error= session->drop_temporary_table(identifier);
378
380
 
379
381
    switch (error) {
380
382
    case  0:
394
396
 
395
397
    table_type= table->getDbType();
396
398
 
397
 
    TableIdentifier identifier(db, table->table_name);
398
 
 
399
399
    {
400
400
      Table *locked_table;
401
401
      abort_locked_tables(session, identifier);