From: Jon Olav Hauglid
Date: September 13 2010 9:23am
Subject: bzr commit into mysql-5.5-runtime branch (jon.hauglid:3136) Bug#56448
List-Archive: http://lists.mysql.com/commits/118057
X-Bug: 56448
Message-Id: <201009130923.o8D7N9fe021993@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7197928426945655414=="

--===============7197928426945655414==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/x/mysql-5.5-runtime-bug56448/ based on revid:jon.hauglid@stripped

 3136 Jon Olav Hauglid	2010-09-13
      Bug #56448 Assertion failed: ! is_set() with second xa end
      
      The problem was that issuing XA END when the XA transaction was
      already ended, caused an assertion. This assertion tests that 
      the server does not try to send OK to the client if there has
      already been an error reported. The bug was only noticeable on
      debug versions of the server.
      
      The reason for the problem was that the trans_xa_end() function
      reported success if the transaction was at XA_IDLE state at the
      end regardless of any errors occured during processing of
      trans_xa_end(). So if the transaction state was XA_IDLE already,
      reported errors would be ignored.
      
      This patch fixes the problem by having trans_xa_end() take into
      consideration any reported errors.
      
      Test case added to xa.test.

    modified:
      mysql-test/r/xa.result
      mysql-test/t/xa.test
      sql/transaction.cc
=== modified file 'mysql-test/r/xa.result'
--- a/mysql-test/r/xa.result	2010-03-10 15:31:22 +0000
+++ b/mysql-test/r/xa.result	2010-09-13 09:23:00 +0000
@@ -131,3 +131,10 @@ XA START 'xid1';
 XA END 'xid1';
 XA ROLLBACK 'xid1';
 DROP TABLE t1;
+#
+# Bug#56448 Assertion failed: ! is_set() with second xa end
+#
+XA START 'x';
+XA END 'x';
+XA END 'x';
+ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the  IDLE state

=== modified file 'mysql-test/t/xa.test'
--- a/mysql-test/t/xa.test	2010-03-24 15:03:44 +0000
+++ b/mysql-test/t/xa.test	2010-09-13 09:23:00 +0000
@@ -228,6 +228,18 @@ XA ROLLBACK 'xid1';
 disconnect con1;
 DROP TABLE t1;
 
+
+--echo #
+--echo # Bug#56448 Assertion failed: ! is_set() with second xa end
+--echo #
+
+XA START 'x';
+XA END 'x';
+# Second XA END caused an assertion.
+--error ER_XAER_RMFAIL
+XA END 'x';
+
+
 # Wait till all disconnects are completed
 --source include/wait_until_count_sessions.inc
 

=== modified file 'sql/transaction.cc'
--- a/sql/transaction.cc	2010-07-27 10:25:53 +0000
+++ b/sql/transaction.cc	2010-09-13 09:23:00 +0000
@@ -565,7 +565,8 @@ bool trans_xa_end(THD *thd)
   else if (!xa_trans_rolled_back(&thd->transaction.xid_state))
     thd->transaction.xid_state.xa_state= XA_IDLE;
 
-  DBUG_RETURN(thd->transaction.xid_state.xa_state != XA_IDLE);
+  DBUG_RETURN(thd->is_error() ||
+              thd->transaction.xid_state.xa_state != XA_IDLE);
 }
 
 


--===============7197928426945655414==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jon.hauglid@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@stripped
# target_branch: file:///export/home/x/mysql-5.5-runtime-bug56448/
# testament_sha1: c91bb26d7201e9da0a253f72e0df4640c2d80a42
# timestamp: 2010-09-13 11:23:03 +0200
# source_branch: file:///export/home/x/mysql-5.5-bugfixing/
# base_revision_id: jon.hauglid@stripped\
#   g410ntzqvdpayclt
# 
# Begin bundle
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
qBsTIbqN6Q5Yf8XckU4UJC6dkTLA


--===============7197928426945655414==--