← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/change_schema.cc

Big merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/change_schema.cc
22
22
#include <drizzled/show.h>
23
23
#include <drizzled/session.h>
24
24
#include <drizzled/statement/change_schema.h>
 
25
#include <drizzled/db.h>
 
26
 
 
27
#include <string>
 
28
 
 
29
using namespace std;
25
30
 
26
31
namespace drizzled
27
32
{
29
34
bool statement::ChangeSchema::execute()
30
35
{
31
36
  Select_Lex *select_lex= &session->lex->select_lex;
32
 
  LEX_STRING db_str= { (char *) select_lex->db, strlen(select_lex->db) };
 
37
  string database_name(select_lex->db);
 
38
  NonNormalisedDatabaseName non_normalised_database_name(database_name);
 
39
  NormalisedDatabaseName normalised_database_name(non_normalised_database_name);
33
40
 
34
 
  if (! mysql_change_db(session, &db_str, false))
 
41
  if (! mysql_change_db(session, normalised_database_name, false))
35
42
  {
36
43
    session->my_ok();
37
44
  }