~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_schema.cc

  • Committer: Stewart Smith
  • Date: 2011-01-04 12:02:05 UTC
  • mto: (2099.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2100.
  • Revision ID: stewart@flamingspork.com-20110104120205-p8ghrkwmhu2aibie
error out on ALTER SCHEMA inside a transaction with ER_TRANSACTIONAL_DDL_NOT_SUPPORTED. Previously this would be ER_LOCK_OR_ACTIVE_TRANSACTION which isn't exactly correct or consistent with others.

Show diffs side-by-side

added added

removed removed

Lines of Context:
61
61
 
62
62
  if (session->inTransaction())
63
63
  {
64
 
    my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, 
65
 
               ER(ER_LOCK_OR_ACTIVE_TRANSACTION), 
66
 
               MYF(0));
 
64
    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
67
65
    return true;
68
66
  }
69
67
  /*