← Back to branch summary

~posulliv/drizzle/optimizer-style-cleanup

« back to all changes in this revision

Viewing changes to drizzled/statement/show_create_schema.cc

  • Committer: Padraig O'Sullivan
  • Date: 2010-04-17 01:38:47 UTC
  • mfrom: (1237.9.238 bad-staging)
  • Revision ID: osullivan.padraig@gmail.com-20100417013847-ibjioqsfbmf5yg4g
Merge trunk.

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
 
  if (check_db_name(&session->lex->name))
 
36
  SchemaIdentifier schema_identifier(string(session->lex->name.str, session->lex->name.length));
 
37
 
 
38
  if (not check_db_name(schema_identifier))
37
39
  {
38
 
    my_error(ER_WRONG_DB_NAME, MYF(0), session->lex->name.str);
 
40
    my_error(ER_WRONG_DB_NAME, MYF(0), schema_identifier.getSQLPath().c_str());
39
41
    return false;
40
42
  }
41
 
  bool res= mysqld_show_create_db(session, session->lex->name.str,
 
43
  bool res= mysqld_show_create_db(*session, schema_identifier,
42
44
                                  is_if_not_exists);
43
45
  return res;
44
46
}