← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/create_schema.cc

Merge Stewart - Fix bug 664222: DDL operations have an implicit commit
Merge Stewart - Fix bug #695201: autocommit=1 not resetting session->server_status properly when committing ongoing txn

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/create_schema.cc
38
38
  if (not validateSchemaOptions())
39
39
    return true;
40
40
 
41
 
  if (not session->endActiveTransaction())
 
41
  if (session->inTransaction())
42
42
  {
 
43
    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
43
44
    return true;
44
45
  }
45
46