← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

TransactionServices method names now meet code style guidelines.

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);
771
771
       * (Which of course should never happen...)
772
772
       */
773
773
      server_status&= ~SERVER_STATUS_IN_TRANS;
774
 
      if (transaction_services.ha_commit_trans(this, true))
 
774
      if (transaction_services.commitTransaction(this, true))
775
775
        result= false;
776
776
      options&= ~(OPTION_BEGIN);
777
777
      break;
788
788
    case ROLLBACK_AND_CHAIN:
789
789
    {
790
790
      server_status&= ~SERVER_STATUS_IN_TRANS;
791
 
      if (transaction_services.ha_rollback_trans(this, true))
 
791
      if (transaction_services.rollbackTransaction(this, true))
792
792
        result= false;
793
793
      options&= ~(OPTION_BEGIN);
794
794
      if (result == true && (completion == ROLLBACK_AND_CHAIN))
821
821
  if (options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
822
822
  {
823
823
    server_status&= ~SERVER_STATUS_IN_TRANS;
824
 
    if (transaction_services.ha_commit_trans(this, true))
 
824
    if (transaction_services.commitTransaction(this, true))
825
825
      result= false;
826
826
  }
827
827
  options&= ~(OPTION_BEGIN);
1952
1952
  {
1953
1953
    TransactionServices &transaction_services= TransactionServices::singleton();
1954
1954
    main_da.can_overwrite_status= true;
1955
 
    transaction_services.ha_autocommit_or_rollback(this, is_error());
 
1955
    transaction_services.autocommitOrRollback(this, is_error());
1956
1956
    main_da.can_overwrite_status= false;
1957
1957
    transaction.stmt.reset();
1958
1958
  }