From: Davi Arnaut
Date: May 25 2009 8:39pm
Subject: bzr commit into mysql-5.1-bugteam branch (davi:2911) Bug#44672
List-Archive: http://lists.mysql.com/commits/74915
X-Bug: 44672
Message-Id: <20090525203955.D1139444597@skynet>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_h8A5xQxL7jFhfgQZDDzLuA)"

--Boundary_(ID_h8A5xQxL7jFhfgQZDDzLuA)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

# At a local mysql-5.1-bugteam repository of davi

 2911 Davi Arnaut	2009-05-25
      Bug#44672: Assertion failed: thd->transaction.xid_state.xid.is_null()
      
      The problem is that when a optimization of read-only transactions
      (bypass 2-phase commit) was implemented, it removed the code that
      reseted the XID once a transaction wasn't active anymore:
      
      sql/sql_parse.cc:
      
      -  bzero(&thd->transaction.stmt, sizeof(thd->transaction.stmt));
      -  if (!thd->active_transaction())
      -    thd->transaction.xid_state.xid.null();
      +  thd->transaction.stmt.reset();
      
      This mostly worked fine as the transaction commit and rollback
      functions (in handler.cc) reset the XID once the transaction is
      ended. But those functions wouldn't reset the XID in case of
      a empty transaction, leading to a assertion when a new starting
      a new XA transaction.
      
      The solution is to ensure that the XID state is reset when empty
      transactions are ended (by either commit or rollback). This is
      achieved by reorganizing the code so that the transaction cleanup
      routine is invoked whenever a transaction is ended.
     @ mysql-test/r/xa.result
        Add test case result for Bug#44672
     @ mysql-test/t/xa.test
        Add test case for Bug#44672
     @ sql/handler.cc
        Invoke transaction cleanup function whenever a transaction is
        ended. Move XID state reset logic to the transaction cleanup
        function.
     @ sql/sql_class.h
        Add XID state reset logic.

    modified:
      mysql-test/r/xa.result
      mysql-test/t/xa.test
      sql/handler.cc
      sql/sql_class.h
=== modified file 'mysql-test/r/xa.result'
--- a/mysql-test/r/xa.result	2008-10-23 20:56:03 +0000
+++ b/mysql-test/r/xa.result	2009-05-25 20:39:49 +0000
@@ -75,3 +75,9 @@ xa rollback 'a','c';
 xa start 'a','c';
 drop table t1;
 End of 5.0 tests
+xa start 'a';
+xa end 'a';
+xa rollback 'a';
+xa start 'a';
+xa end 'a';
+xa rollback 'a';

=== modified file 'mysql-test/t/xa.test'
--- a/mysql-test/t/xa.test	2009-03-03 20:34:18 +0000
+++ b/mysql-test/t/xa.test	2009-05-25 20:39:49 +0000
@@ -124,6 +124,17 @@ drop table t1;
 
 --echo End of 5.0 tests
 
+#
+# Bug#44672: Assertion failed: thd->transaction.xid_state.xid.is_null()
+#
+
+xa start 'a';
+xa end 'a';
+xa rollback 'a';
+xa start 'a';
+xa end 'a';
+xa rollback 'a';
+
 # Wait till all disconnects are completed
 --source include/wait_until_count_sessions.inc
 

=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2009-03-27 09:34:24 +0000
+++ b/sql/handler.cc	2009-05-25 20:39:49 +0000
@@ -1184,16 +1184,9 @@ end:
     if (rw_trans)
       start_waiting_global_read_lock(thd);
   }
-  else if (all)
-  {
-    /*
-      A COMMIT of an empty transaction. There may be savepoints.
-      Destroy them. If the transaction is not empty
-      savepoints are cleared in ha_commit_one_phase()
-      or ha_rollback_trans().
-    */
-    thd->transaction.cleanup();
-  }
+  /* Free resources and perform other cleanup. */
+  if (is_real_trans)
+    thd->transaction.cleanup(thd);
 #endif /* USING_TRANSACTIONS */
   DBUG_RETURN(error);
 }
@@ -1227,8 +1220,6 @@ int ha_commit_one_phase(THD *thd, bool a
     }
     trans->ha_list= 0;
     trans->no_2pc=0;
-    if (is_real_trans)
-      thd->transaction.xid_state.xid.null();
     if (all)
     {
 #ifdef HAVE_QUERY_CACHE
@@ -1236,8 +1227,9 @@ int ha_commit_one_phase(THD *thd, bool a
         query_cache.invalidate(thd->transaction.changed_tables);
 #endif
       thd->variables.tx_isolation=thd->session_tx_isolation;
-      thd->transaction.cleanup();
     }
+    if (is_real_trans)
+      thd->transaction.cleanup(thd);
   }
 #endif /* USING_TRANSACTIONS */
   DBUG_RETURN(error);
@@ -1294,19 +1286,12 @@ int ha_rollback_trans(THD *thd, bool all
     }
     trans->ha_list= 0;
     trans->no_2pc=0;
-    if (is_real_trans)
-    {
-      if (thd->transaction_rollback_request)
-        thd->transaction.xid_state.rm_error= thd->main_da.sql_errno();
-      else
-        thd->transaction.xid_state.xid.null();
-    }
     if (all)
       thd->variables.tx_isolation=thd->session_tx_isolation;
   }
   /* Always cleanup. Even if there nht==0. There may be savepoints. */
-  if (all)
-    thd->transaction.cleanup();
+  if (is_real_trans)
+    thd->transaction.cleanup(thd);
 #endif /* USING_TRANSACTIONS */
   if (all)
     thd->transaction_rollback_request= FALSE;

=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2009-05-15 12:57:51 +0000
+++ b/sql/sql_class.h	2009-05-25 20:39:49 +0000
@@ -1435,10 +1435,14 @@ public:
     */
     CHANGED_TABLE_LIST* changed_tables;
     MEM_ROOT mem_root; // Transaction-life memory allocation pool
-    void cleanup()
+    void cleanup(THD *thd)
     {
       changed_tables= 0;
       savepoints= 0;
+      if (thd->transaction_rollback_request)
+        xid_state.rm_error= thd->main_da.sql_errno();
+      else
+        xid_state.xid.null();
 #ifdef USING_TRANSACTIONS
       free_root(&mem_root,MYF(MY_KEEP_PREALLOC));
 #endif


--Boundary_(ID_h8A5xQxL7jFhfgQZDDzLuA)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/davi.arnaut@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/davi.arnaut@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: davi.arnaut@stripped
# target_branch: file:///home/davi/bzr/work/44672-5.1/
# testament_sha1: d15080526bf92abc1061aa023b1810e41f8e53a5
# timestamp: 2009-05-25 17:39:55 -0300
# base_revision_id: staale.smedseng@stripped\
#   si1aiu6jpx3wgpas
# 
# Begin bundle
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


--Boundary_(ID_h8A5xQxL7jFhfgQZDDzLuA)--