← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/transaction_services.cc

  • Committer: lbieber
  • Date: 2010-09-27 22:20:57 UTC
  • mfrom: (1798.1.1 build)
  • Revision ID: lbieber@orisndriz08-20100927222057-sp5zzycma0nax1xn
Merge Shrews - fix bug 644760 - Transaction log losing data when a bad query (ERROR 1093) is encountered mid-transaction

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();