← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_schema.cc

  • Committer: pawel
  • Date: 2010-03-29 20:16:08 UTC
  • mto: This revision was merged to the branch mainline in revision 1428.
  • Revision ID: pawel@paw-20100329201608-ndqnc736k47uvy3s
changed function-like defines into functions in some files

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_schema.cc
37
37
  LEX_STRING *db= &session->lex->name;
38
38
  message::Schema old_definition;
39
39
 
40
 
  SchemaIdentifier schema_identifier(string(db->str, db->length));
41
 
 
42
 
  if (not check_db_name(schema_identifier))
 
40
  if (check_db_name(db))
43
41
  {
44
 
    my_error(ER_WRONG_DB_NAME, MYF(0), schema_identifier.getSQLPath().c_str());
 
42
    my_error(ER_WRONG_DB_NAME, MYF(0), db->str);
45
43
    return false;
46
44
  }
47
45
 
48
46
  schema_message.set_name(db->str);
49
 
  SchemaIdentifier identifier(schema_message.name());
50
47
 
51
 
  if (not plugin::StorageEngine::getSchemaDefinition(identifier, old_definition))
 
48
  if (not plugin::StorageEngine::getSchemaDefinition(schema_message.name(), old_definition))
52
49
  {
53
50
    my_error(ER_SCHEMA_DOES_NOT_EXIST, MYF(0), db->str);
54
51
    return true;