← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-23 10:47:03 UTC
  • mto: This revision was merged to the branch mainline in revision 2348.
  • Revision ID: olafvdspek@gmail.com-20110623104703-hw93svu0vfgcqt9p
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
406
406
  }
407
407
#endif
408
408
  {
409
 
    TransactionServices &transaction_services= TransactionServices::singleton();
410
 
    transaction_services.rollbackTransaction(*this, true);
 
409
    TransactionServices::rollbackTransaction(*this, true);
411
410
  }
412
411
 
413
412
  BOOST_FOREACH(UserVars::reference iter, user_vars)
745
744
{
746
745
  bool do_release= 0;
747
746
  bool result= true;
748
 
  TransactionServices &transaction_services= TransactionServices::singleton();
749
747
 
750
748
  if (transaction.xid_state.xa_state != XA_NOTR)
751
749
  {
761
759
       * (Which of course should never happen...)
762
760
       */
763
761
      server_status&= ~SERVER_STATUS_IN_TRANS;
764
 
      if (transaction_services.commitTransaction(*this, true))
 
762
      if (TransactionServices::commitTransaction(*this, true))
765
763
        result= false;
766
764
      options&= ~(OPTION_BEGIN);
767
765
      break;
778
776
    case ROLLBACK_AND_CHAIN:
779
777
    {
780
778
      server_status&= ~SERVER_STATUS_IN_TRANS;
781
 
      if (transaction_services.rollbackTransaction(*this, true))
 
779
      if (TransactionServices::rollbackTransaction(*this, true))
782
780
        result= false;
783
781
      options&= ~(OPTION_BEGIN);
784
782
      if (result == true && (completion == ROLLBACK_AND_CHAIN))
805
803
bool Session::endActiveTransaction()
806
804
{
807
805
  bool result= true;
808
 
  TransactionServices &transaction_services= TransactionServices::singleton();
809
806
 
810
807
  if (transaction.xid_state.xa_state != XA_NOTR)
811
808
  {
815
812
  if (options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
816
813
  {
817
814
    server_status&= ~SERVER_STATUS_IN_TRANS;
818
 
    if (transaction_services.commitTransaction(*this, true))
 
815
    if (TransactionServices::commitTransaction(*this, true))
819
816
      result= false;
820
817
  }
821
818
  options&= ~(OPTION_BEGIN);
1814
1811
    TODO: This should be fixed in later releases.
1815
1812
   */
1816
1813
  {
1817
 
    TransactionServices &transaction_services= TransactionServices::singleton();
1818
1814
    main_da().can_overwrite_status= true;
1819
 
    transaction_services.autocommitOrRollback(*this, is_error());
 
1815
    TransactionServices::autocommitOrRollback(*this, is_error());
1820
1816
    main_da().can_overwrite_status= false;
1821
1817
    transaction.stmt.reset();
1822
1818
  }