bk commit into 5.1 tree (tomas:1.2479)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2479 07/03/20 09:36:11 tomas@poseidon. +2 -0
  Merge tulin@stripped:/home/bk/mysql-5.1-telco
  into  poseidon.:/home/tomas/mysql-5.1-telco-merge

  storage/ndb/test/ndbapi/testNodeRestart.cpp
    1.49 07/03/20 09:35:51 tomas@poseidon. +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.144 07/03/20 09:35:51 tomas@poseidon. +0 -0
    Auto merged

# 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:	tomas
# Host:	poseidon.
# Root:	/home/tomas/mysql-5.1-telco-merge/RESYNC

--- 1.143/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-03-08 19:20:36 +01:00
+++ 1.144/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-03-20 09:35:51 +01:00
@@ -7189,20 +7189,15 @@ Dbtc::nodeFailCheckTransactions(Signal* 
   for (transPtr.i = transPtrI; transPtr.i < capiConnectFilesize; transPtr.i++)
   {
     ptrCheckGuard(transPtr, capiConnectFilesize, apiConnectRecord); 
-    Uint32 state = transPtr.p->apiConnectstate;
     if (transPtr.p->m_transaction_nodes.get(failedNodeId))
     {
       jam();
       
-      // 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;
-      }
+      // 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

--- 1.48/storage/ndb/test/ndbapi/testNodeRestart.cpp	2007-03-19 10:59:35 +01:00
+++ 1.49/storage/ndb/test/ndbapi/testNodeRestart.cpp	2007-03-20 09:35:51 +01:00
@@ -887,6 +887,9 @@ int runBug20185(NDBT_Context* ctx, NDBT_
     return NDBT_FAILED;
   
   NdbSleep_MilliSleep(3000);
+  Vector<int> nodes;
+  for (Uint32 i = 0; i<restarter.getNumDbNodes(); i++)
+    nodes.push_back(restarter.getDbNodeId(i));
   
 retry:
   if(hugoOps.startTransaction(pNdb) != 0)
@@ -910,11 +913,16 @@ retry:
     nodeId = restarter.getDbNodeId(rand() % restarter.getNumDbNodes());
   } while (nodeId == node);
   
-  if (restarter.insertErrorInAllNodes(7030))
-    return NDBT_FAILED;
-  
+  ndbout_c("7031 to %d", nodeId);
   if (restarter.insertErrorInNode(nodeId, 7031))
     return NDBT_FAILED;
+
+  for (Uint32 i = 0; i<nodes.size(); i++)
+  {
+    if (nodes[i] != nodeId)
+      if (restarter.insertErrorInNode(nodes[i], 7030))
+	return NDBT_FAILED;
+  }
   
   NdbSleep_MilliSleep(500);