← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_schema.cc

  • Committer: Brian Aker
  • Date: 2011-01-04 22:27:38 UTC
  • mfrom: (2041.3.16 session-fix)
  • mto: This revision was merged to the branch mainline in revision 2055.
  • Revision ID: brian@tangent.org-20110104222738-4r3hrsxrlbuildrg
Merge in cleanup of error messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_schema.cc
45
45
 
46
46
  if (not check_db_name(session, schema_identifier))
47
47
  {
48
 
    std::string path;
49
 
    schema_identifier.getSQLPath(path);
50
 
    my_error(ER_WRONG_DB_NAME, MYF(0), path.c_str());
 
48
    my_error(ER_WRONG_DB_NAME, schema_identifier);
51
49
 
52
50
    return false;
53
51
  }
55
53
  SchemaIdentifier identifier(db->str);
56
54
  if (not plugin::StorageEngine::getSchemaDefinition(identifier, old_definition))
57
55
  {
58
 
    my_error(ER_SCHEMA_DOES_NOT_EXIST, MYF(0), db->str);
 
56
    my_error(ER_SCHEMA_DOES_NOT_EXIST, identifier); 
59
57
    return true;
60
58
  }
61
59