← Back to branch summary

~jaypipes/drizzle/replication-ddl

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_table.cc

  • Committer: Jay Pipes
  • Date: 2010-04-01 18:42:31 UTC
  • mfrom: (1405.4.18 bad-staging)
  • Revision ID: jpipes@serialcoder-20100401184231-pigk7uoqoynmhqhk
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_table.cc
91
91
    if (create_info.db_type == NULL)
92
92
    {
93
93
      my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), 
94
 
               create_table_message.name().c_str());
 
94
               create_table_message.engine().name().c_str());
95
95
 
96
96
      return true;
97
97
    }
107
107
    TableIdentifier identifier(first_table->db, first_table->table_name);
108
108
    if (plugin::StorageEngine::getTableDefinition(*session, identifier, original_table_message) != EEXIST)
109
109
    {
110
 
      my_error(ER_TABLE_EXISTS_ERROR, MYF(0), identifier.getSQLPath().c_str());
 
110
      my_error(ER_BAD_TABLE_ERROR, MYF(0), identifier.getSQLPath().c_str());
111
111
      return true;
112
112
    }
113
113
  }
1221
1221
      return true;
1222
1222
    }
1223
1223
 
1224
 
 
1225
1224
    pthread_mutex_unlock(&LOCK_open);
1226
1225
 
1227
1226
    session->set_proc_info("end");