← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/drop_schema.cc

  • Committer: Brian Aker
  • Date: 2010-01-22 00:53:13 UTC
  • Revision ID: brian@gaz-20100122005313-jmizcbcdi1lt4tcx
Revert db patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/drop_schema.cc
33
33
 
34
34
bool statement::DropSchema::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
36
  if (! session->endActiveTransaction())
41
37
  {
42
38
    return true;
43
39
  }
44
 
  if (! normalised_database_name.isValid())
 
40
  if (check_db_name(&session->lex->name))
45
41
  {
46
 
    my_error(ER_WRONG_DB_NAME, MYF(0),
47
 
             normalised_database_name.to_string().c_str());
 
42
    my_error(ER_WRONG_DB_NAME, MYF(0), session->lex->name.str);
48
43
    return false;
49
44
  }
50
45
  if (session->inTransaction())
54
49
        MYF(0));
55
50
    return true;
56
51
  }
57
 
  bool res= mysql_rm_db(session, normalised_database_name, drop_if_exists);
 
52
  bool res= mysql_rm_db(session, session->lex->name.str, drop_if_exists);
58
53
  return res;
59
54
}
60
55