← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/drop_index.cc

  • Committer: Brian Aker
  • Date: 2010-10-24 01:44:25 UTC
  • mfrom: (1874.1.2 catalogs)
  • Revision ID: brian@tangent.org-20101024014425-exsst7015tqgbw7x
Table encapsulate merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/drop_index.cc
36
36
  /* Chicken/Egg... we need to search for the table, to know if the table exists, so we can build a full identifier from it */
37
37
  message::Table original_table_message;
38
38
  {
39
 
    TableIdentifier identifier(first_table->db, first_table->table_name);
 
39
    TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName());
40
40
    if (plugin::StorageEngine::getTableDefinition(*session, identifier, original_table_message) != EEXIST)
41
41
    {
42
42
      my_error(ER_BAD_TABLE_ERROR, MYF(0), identifier.getSQLPath().c_str());
67
67
  bool res;
68
68
  if (original_table_message.type() == message::Table::STANDARD )
69
69
  {
70
 
    TableIdentifier identifier(first_table->db, first_table->table_name);
 
70
    TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName());
71
71
 
72
72
    create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
73
73
 
83
83
  }
84
84
  else
85
85
  {
86
 
    TableIdentifier catch22(first_table->db, first_table->table_name);
 
86
    TableIdentifier catch22(first_table->getSchemaName(), first_table->getTableName());
87
87
    Table *table= session->find_temporary_table(catch22);
88
88
    assert(table);
89
89
    {
90
 
      TableIdentifier identifier(first_table->db, first_table->table_name, table->getShare()->getPath());
 
90
      TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName(), table->getShare()->getPath());
91
91
      create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
92
92
 
93
93
      res= alter_table(session,