From: Date: June 2 2006 3:22pm
Subject: bk commit into 5.1 tree (jonas:1.2384) BUG#20185
List-Archive: http://lists.mysql.com/commits/7209
X-Bug: 20185
Message-Id: <20060602132255.2AA9241301A@perch.ndb.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2384 06/06/02 15:22:49 jonas@stripped +1 -0
  ndb - bug#20185
    second try - handle CS_PREPARE_TO_COMMIT explicitly

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.116 06/06/02 15:22:46 jonas@stripped +11 -6
    handle CS_PREPARE_TO_COMMIT explictly

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-jonas

--- 1.115/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2006-06-01 14:34:43 +02:00
+++ 1.116/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2006-06-02 15:22:46 +02:00
@@ -7093,15 +7093,20 @@ Dbtc::nodeFailCheckTransactions(Signal* 
   for (transPtr.i = transPtrI; transPtr.i < capiConnectFilesize; transPtr.i++)
   {
     ptrCheckGuard(transPtr, capiConnectFilesize, apiConnectRecord); 
+    Uiint32 state = transPtr.p->apiConnectstate;
     if (transPtr.p->m_transaction_nodes.get(failedNodeId))
     {
       jam();
-
-      // Force timeout regardless of state      
-      c_appl_timeout_value = 1;
-      setApiConTimer(transPtr.i, TtcTimer - 2, __LINE__);
-      timeOutFoundLab(signal, transPtr.i, ZNODEFAIL_BEFORE_COMMIT);
-      c_appl_timeout_value = TapplTimeout;
+      
+      // avoid assertion in timeoutfoundlab
+      if (state != CS_PREPARE_TO_COMMIT)
+      {
+	// Force timeout regardless of state      
+	c_appl_timeout_value = 1;
+	setApiConTimer(transPtr.i, TtcTimer - 2, __LINE__);
+	timeOutFoundLab(signal, transPtr.i, ZNODEFAIL_BEFORE_COMMIT);
+	c_appl_timeout_value = TapplTimeout;
+      }
     }
     
     // Send CONTINUEB to continue later