~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Brian Aker
  • Date: 2010-02-19 16:34:09 UTC
  • mfrom: (1273.13.92 build)
  • Revision ID: brian@gaz-20100219163409-wh45g0p6fzdsed6r
Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1379
1379
    {
1380
1380
      /* We changed to auto_commit mode */
1381
1381
      session->options&= ~(uint64_t) (OPTION_BEGIN);
1382
 
      session->transaction.all.modified_non_trans_table= false;
1383
1382
      session->server_status|= SERVER_STATUS_AUTOCOMMIT;
1384
1383
      TransactionServices &transaction_services= TransactionServices::singleton();
1385
1384
      if (transaction_services.ha_commit_trans(session, true))
1387
1386
    }
1388
1387
    else
1389
1388
    {
1390
 
      session->transaction.all.modified_non_trans_table= false;
1391
1389
      session->server_status&= ~SERVER_STATUS_AUTOCOMMIT;
1392
1390
    }
1393
1391
  }