← 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-03-31 05:53:34 UTC
  • Revision ID: brian@gaz-20100331055334-yqqmzlgqb2xq1p5b
Mass overhaul to use schema_identifier.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/drop_index.cc
39
39
    TableIdentifier identifier(first_table->db, first_table->table_name);
40
40
    if (plugin::StorageEngine::getTableDefinition(*session, identifier, original_table_message) != EEXIST)
41
41
    {
42
 
      my_error(ER_TABLE_EXISTS_ERROR, MYF(0), identifier.getSQLPath().c_str());
 
42
      my_error(ER_BAD_TABLE_ERROR, MYF(0), identifier.getSQLPath().c_str());
43
43
      return true;
44
44
    }
45
45
  }
64
64
  memset(&create_info, 0, sizeof(create_info));
65
65
  create_info.db_type= 0;
66
66
  create_info.row_type= ROW_TYPE_NOT_USED;
67
 
  create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(session->db.c_str());
68
67
 
69
68
  bool res;
70
69
  if (original_table_message.type() == message::Table::STANDARD )
71
70
  {
72
71
    TableIdentifier identifier(first_table->db, first_table->table_name);
73
72
 
 
73
    create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
 
74
 
74
75
    res= alter_table(session, 
75
76
                     identifier,
76
77
                     identifier,
86
87
    assert(table);
87
88
    {
88
89
      TableIdentifier identifier(first_table->db, first_table->table_name, table->s->path.str);
 
90
      create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
89
91
 
90
92
      res= alter_table(session, 
91
93
                       identifier,