← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2009-03-25 22:52:34 UTC
  • mfrom: (934.2.28 small-cleanups)
  • Revision ID: brian@tangent.org-20090325225234-2ewmv7ma3kh858jk
Merge with Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
1044
1044
      Don't allow this within a transaction because we want to use
1045
1045
      re-generate table
1046
1046
    */
1047
 
    if (session->locked_tables || session->active_transaction())
 
1047
    if (session->locked_tables || session->inTransaction())
1048
1048
    {
1049
 
      my_message(ER_LOCK_OR_ACTIVE_TRANSACTION,
1050
 
                 ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
 
1049
      my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
1051
1050
      goto error;
1052
1051
    }
1053
1052
 
1310
1309
      my_error(ER_WRONG_DB_NAME, MYF(0), lex->name.str);
1311
1310
      break;
1312
1311
    }
1313
 
    if (session->locked_tables || session->active_transaction())
 
1312
    if (session->locked_tables || session->inTransaction())
1314
1313
    {
1315
 
      my_message(ER_LOCK_OR_ACTIVE_TRANSACTION,
1316
 
                 ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
 
1314
      my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
1317
1315
      goto error;
1318
1316
    }
1319
1317
    res= mysql_rm_db(session, lex->name.str, lex->drop_if_exists, 0);
1328
1326
      my_error(ER_WRONG_DB_NAME, MYF(0), db->str);
1329
1327
      break;
1330
1328
    }
1331
 
    if (session->locked_tables || session->active_transaction())
 
1329
    if (session->locked_tables || session->inTransaction())
1332
1330
    {
1333
 
      my_message(ER_LOCK_OR_ACTIVE_TRANSACTION,
1334
 
                 ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
 
1331
      my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
1335
1332
      goto error;
1336
1333
    }
1337
1334
    res= mysql_alter_db(session, db->str, &create_info);