← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/show_create_schema.cc

  • Committer: Monty Taylor
  • Date: 2009-12-08 22:43:58 UTC
  • mfrom: (1240.1.5 build)
  • mto: (1240.1.6 build)
  • mto: This revision was merged to the branch mainline in revision 1241.
  • Revision ID: mordred@inaugust.com-20091208224358-u1pazjsnn4n932cu
Merged up build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/show_create_schema.cc
22
22
#include <drizzled/show.h>
23
23
#include <drizzled/session.h>
24
24
#include <drizzled/statement/show_create_schema.h>
 
25
#include <drizzled/db.h>
 
26
 
 
27
#include <string>
 
28
 
 
29
using namespace std;
25
30
 
26
31
namespace drizzled
27
32
{
28
33
 
29
34
bool statement::ShowCreateSchema::execute()
30
35
{
31
 
  if (check_db_name(&session->lex->name))
 
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())
32
41
  {
33
 
    my_error(ER_WRONG_DB_NAME, MYF(0), session->lex->name.str);
 
42
    my_error(ER_WRONG_DB_NAME, MYF(0),
 
43
             normalised_database_name.to_string().c_str());
34
44
    return false;
35
45
  }
36
 
  bool res= mysqld_show_create_db(session, session->lex->name.str,
 
46
  bool res= mysqld_show_create_db(session, normalised_database_name,
37
47
                                  is_if_not_exists);
38
48
  return res;
39
49
}