← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Lee Bieber
  • Date: 2011-01-25 02:10:42 UTC
  • mfrom: (2109.1.4 build)
  • Revision ID: kalebral@gmail.com-20110125021042-ocqa0v509ae7fmtz
Need to add a "drop table a" in execute.wait test
Add execute test suite to regular test run
Merge Lee - fix second part of 705699, check for both client and server before building and testing rabbitmq plugin
Merge Shrews - Changes TransactionServices methods to use references to Session objects instead of pointers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
355
355
#endif
356
356
  {
357
357
    TransactionServices &transaction_services= TransactionServices::singleton();
358
 
    transaction_services.rollbackTransaction(this, true);
 
358
    transaction_services.rollbackTransaction(*this, true);
359
359
    xid_cache_delete(&transaction.xid_state);
360
360
  }
361
361
 
773
773
       * (Which of course should never happen...)
774
774
       */
775
775
      server_status&= ~SERVER_STATUS_IN_TRANS;
776
 
      if (transaction_services.commitTransaction(this, true))
 
776
      if (transaction_services.commitTransaction(*this, true))
777
777
        result= false;
778
778
      options&= ~(OPTION_BEGIN);
779
779
      break;
790
790
    case ROLLBACK_AND_CHAIN:
791
791
    {
792
792
      server_status&= ~SERVER_STATUS_IN_TRANS;
793
 
      if (transaction_services.rollbackTransaction(this, true))
 
793
      if (transaction_services.rollbackTransaction(*this, true))
794
794
        result= false;
795
795
      options&= ~(OPTION_BEGIN);
796
796
      if (result == true && (completion == ROLLBACK_AND_CHAIN))
827
827
  if (options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
828
828
  {
829
829
    server_status&= ~SERVER_STATUS_IN_TRANS;
830
 
    if (transaction_services.commitTransaction(this, true))
 
830
    if (transaction_services.commitTransaction(*this, true))
831
831
      result= false;
832
832
  }
833
833
  options&= ~(OPTION_BEGIN);
1901
1901
  {
1902
1902
    TransactionServices &transaction_services= TransactionServices::singleton();
1903
1903
    main_da.can_overwrite_status= true;
1904
 
    transaction_services.autocommitOrRollback(this, is_error());
 
1904
    transaction_services.autocommitOrRollback(*this, is_error());
1905
1905
    main_da.can_overwrite_status= false;
1906
1906
    transaction.stmt.reset();
1907
1907
  }