~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Stewart Smith
  • Date: 2010-04-09 07:17:26 UTC
  • mfrom: (1283.28.41)
  • mto: (1283.36.25)
  • mto: This revision was merged to the branch mainline in revision 1536.
  • Revision ID: stewart@flamingspork.com-20100409071726-c146xe10lj5n2hug
Merged embedded-innodb-position-rnd-pos into embedded-innodb-autoincrement.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1381
1381
      session->options&= ~(uint64_t) (OPTION_BEGIN);
1382
1382
      session->server_status|= SERVER_STATUS_AUTOCOMMIT;
1383
1383
      TransactionServices &transaction_services= TransactionServices::singleton();
1384
 
      if (transaction_services.ha_commit_trans(session, true))
 
1384
      if (transaction_services.commitTransaction(session, true))
1385
1385
        return 1;
1386
1386
    }
1387
1387
    else