← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/transaction_services.cc

  • Committer: Lee Bieber
  • Date: 2011-02-10 21:02:41 UTC
  • mfrom: (2154.1.3 build)
  • Revision ID: kalebral@gmail.com-20110210210241-jouae2uw2pwv6bac
Merge Patrick - 715885: dbqp needs to return non-zero if tests fail
Merge Stewart - 715539: (get|set)_session_proc_info() still exists
Merge Stewart - 715575: misc session_foo() functions exist - should be methods in Session
Merge Stewart - 712843: SAVEPOINT after rollback due to deadlock with autocommit=off in transaction will call startTransaction with an existing transaction where one shouldn't exist

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/transaction_services.cc
746
746
    {
747
747
      (void) rollbackTransaction(session, false);
748
748
      if (session.transaction_rollback_request)
 
749
      {
749
750
        (void) rollbackTransaction(session, true);
 
751
        session.server_status&= ~SERVER_STATUS_IN_TRANS;
 
752
      }
750
753
    }
751
754
 
752
755
    session.variables.tx_isolation= session.session_tx_isolation;
753
756
  }
 
757
 
754
758
  return error;
755
759
}
756
760