← Back to branch summary

~drizzle-developers/drizzle/elliott-release

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_schema.cc

  • Committer: Patrick Crews
  • Date: 2011-02-01 20:33:06 UTC
  • mfrom: (1845.2.288 drizzle)
  • Revision ID: gleebix@gmail.com-20110201203306-mwq2rk0it81tlwxh
Merged Trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_schema.cc
35
35
 
36
36
bool statement::AlterSchema::execute()
37
37
{
38
 
  LEX_STRING *db= &session->lex->name;
 
38
  LEX_STRING *db= &getSession()->lex->name;
39
39
  message::schema::shared_ptr old_definition;
40
40
 
41
41
  if (not validateSchemaOptions())
43
43
 
44
44
  identifier::Schema schema_identifier(string(db->str, db->length));
45
45
 
46
 
  if (not check_db_name(session, schema_identifier))
 
46
  if (not check_db_name(getSession(), schema_identifier))
47
47
  {
48
48
    my_error(ER_WRONG_DB_NAME, schema_identifier);
49
49
 
57
57
    return true;
58
58
  }
59
59
 
60
 
  if (session->inTransaction())
 
60
  if (getSession()->inTransaction())
61
61
  {
62
 
    my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, 
63
 
               ER(ER_LOCK_OR_ACTIVE_TRANSACTION), 
64
 
               MYF(0));
 
62
    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
65
63
    return true;
66
64
  }
67
65
  /*
85
83
  
86
84
  drizzled::message::update(schema_message);
87
85
 
88
 
  bool res= alter_db(session, schema_message, old_definition);
 
86
  bool res= alter_db(getSession(), schema_message, old_definition);
89
87
 
90
88
  return not res;
91
89
}