← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/transaction_services.cc

  • Committer: Joseph Daly
  • Date: 2010-09-28 01:43:36 UTC
  • mfrom: (1799 staging)
  • mto: (1799.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 1800.
  • Revision ID: jdaly@rx7-20100928014336-wxjexq5c8js3cs8v
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/transaction_services.cc
654
654
     * a rollback statement with the corresponding transaction ID
655
655
     * to rollback.
656
656
     */
657
 
    rollbackTransactionMessage(session);
 
657
    if (normal_transaction)
 
658
      rollbackTransactionMessage(session);
658
659
 
659
660
    if (is_real_trans)
660
661
      session->transaction.xid_state.xid.null();