← Back to branch summary

~chillycreator/drizzle/drizzle-fix

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2010-04-06 06:50:19 UTC
  • mfrom: (1405.3.9 replication-api)
  • Revision ID: brian@gaz-20100406065019-n387mztxp1i75qel
Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
369
369
#endif
370
370
  {
371
371
    TransactionServices &transaction_services= TransactionServices::singleton();
372
 
    transaction_services.ha_rollback_trans(this, true);
 
372
    transaction_services.rollbackTransaction(this, true);
373
373
    xid_cache_delete(&transaction.xid_state);
374
374
  }
375
375
  hash_free(&user_vars);
772
772
       * (Which of course should never happen...)
773
773
       */
774
774
      server_status&= ~SERVER_STATUS_IN_TRANS;
775
 
      if (transaction_services.ha_commit_trans(this, true))
 
775
      if (transaction_services.commitTransaction(this, true))
776
776
        result= false;
777
777
      options&= ~(OPTION_BEGIN);
778
778
      break;
789
789
    case ROLLBACK_AND_CHAIN:
790
790
    {
791
791
      server_status&= ~SERVER_STATUS_IN_TRANS;
792
 
      if (transaction_services.ha_rollback_trans(this, true))
 
792
      if (transaction_services.rollbackTransaction(this, true))
793
793
        result= false;
794
794
      options&= ~(OPTION_BEGIN);
795
795
      if (result == true && (completion == ROLLBACK_AND_CHAIN))
822
822
  if (options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
823
823
  {
824
824
    server_status&= ~SERVER_STATUS_IN_TRANS;
825
 
    if (transaction_services.ha_commit_trans(this, true))
 
825
    if (transaction_services.commitTransaction(this, true))
826
826
      result= false;
827
827
  }
828
828
  options&= ~(OPTION_BEGIN);
1947
1947
  {
1948
1948
    TransactionServices &transaction_services= TransactionServices::singleton();
1949
1949
    main_da.can_overwrite_status= true;
1950
 
    transaction_services.ha_autocommit_or_rollback(this, is_error());
 
1950
    transaction_services.autocommitOrRollback(this, is_error());
1951
1951
    main_da.can_overwrite_status= false;
1952
1952
    transaction.stmt.reset();
1953
1953
  }