← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/transaction_services.cc

  • Committer: Stewart Smith
  • Date: 2011-02-07 08:28:31 UTC
  • mto: (2154.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 2155.
  • Revision ID: stewart@flamingspork.com-20110207082831-wxhahfcbpzac447w
fix SERVER_STATUS_IN_TRANS for rollback in autocommitOrRollback

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