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

--===============7461149486556677795==
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. The patch also fixes a similar
      bug with XA PREPARE.
      
      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 11:31:22 +0000
@@ -131,3 +131,14 @@ 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
+XA PREPARE 'x';
+XA PREPARE 'x';
+ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the  PREPARED state
+XA ROLLBACK 'x';

=== 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 11:31:22 +0000
@@ -228,6 +228,23 @@ 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';
+XA PREPARE 'x';
+# Second XA PREPARE also caused an assertion.
+--error ER_XAER_RMFAIL
+XA PREPARE 'x';
+XA ROLLBACK '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 11:31:22 +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);
 }
 
 
@@ -596,7 +597,8 @@ bool trans_xa_prepare(THD *thd)
   else
     thd->transaction.xid_state.xa_state= XA_PREPARED;
 
-  DBUG_RETURN(thd->transaction.xid_state.xa_state != XA_PREPARED);
+  DBUG_RETURN(thd->is_error() ||
+              thd->transaction.xid_state.xa_state != XA_PREPARED);
 }
 
 


--===============7461149486556677795==
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: 17e583cc52c678b4bd0a2298f502fbb2a1fb9cb7
# timestamp: 2010-09-13 13:31:27 +0200
# source_branch: file:///export/home/x/mysql-5.5-bugfixing/
# base_revision_id: jon.hauglid@stripped\
#   g410ntzqvdpayclt
# 
# Begin bundle
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
UJDxf0jU


--===============7461149486556677795==--