← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/show_create_schema.cc

Merged unify_error into errors-in-hash-map.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/show_create_schema.cc
33
33
 
34
34
bool statement::ShowCreateSchema::execute()
35
35
{
36
 
  string database_name(session->lex->name.str);
37
 
  NonNormalisedDatabaseName non_normalised_database_name(database_name);
38
 
  NormalisedDatabaseName normalised_database_name(non_normalised_database_name);
39
 
 
40
 
  if (! normalised_database_name.isValid())
 
36
  if (check_db_name(&session->lex->name))
41
37
  {
42
 
    my_error(ER_WRONG_DB_NAME, MYF(0),
43
 
             normalised_database_name.to_string().c_str());
 
38
    my_error(ER_WRONG_DB_NAME, MYF(0), session->lex->name.str);
44
39
    return false;
45
40
  }
46
 
  bool res= mysqld_show_create_db(session, normalised_database_name,
 
41
  bool res= mysqld_show_create_db(session, session->lex->name.str,
47
42
                                  is_if_not_exists);
48
43
  return res;
49
44
}