← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2010-03-27 04:12:14 UTC
  • mfrom: (1395.1.18 build)
  • Revision ID: brian@gaz-20100327041214-2pm5eay51312xjvq
Merge (fixes known issues in ALTER TABLE not resetting correctly DFE).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
1546
1546
  cursor= 0;                            /* For easier errorchecking */
1547
1547
  if (free_share)
1548
1548
  {
1549
 
    if (s->tmp_table == STANDARD_TABLE)
 
1549
    if (s->tmp_table == message::Table::STANDARD)
1550
1550
      TableShare::release(s);
1551
1551
    else
1552
1552
      s->free_table_share();
3302
3302
    if (db_stat)
3303
3303
      cursor->closeMarkForDelete(s->table_name.str);
3304
3304
 
3305
 
    TableIdentifier identifier(s->table_name.str);
 
3305
    TableIdentifier identifier(s->getSchemaName(), s->table_name.str, s->table_name.str);
3306
3306
    s->db_type()->doDropTable(*session, identifier);
3307
3307
 
3308
3308
    delete cursor;
3417
3417
 
3418
3418
 err1:
3419
3419
  {
3420
 
    TableIdentifier identifier(new_table.s->table_name.str);
 
3420
    TableIdentifier identifier(new_table.s->getSchemaName(), new_table.s->table_name.str, new_table.s->table_name.str);
3421
3421
    new_table.s->db_type()->doDropTable(*session, identifier);
3422
3422
  }
3423
3423
 
3691
3691
  key_length= TableShare::createKey(key, identifier);
3692
3692
  share->set_table_cache_key(key, key_length);
3693
3693
 
 
3694
  message::Table *message= share->getTableProto();
 
3695
 
 
3696
  message->set_name(identifier.getTableName());
 
3697
  message->set_schema(identifier.getSchemaName());
 
3698
 
3694
3699
  return false;
3695
3700
}
3696
3701