Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb

into  poseidon.:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

@@ -7188,20 +7188,15 @@ Dbtc::nodeFailCheckTransactions(Signal* 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

storage/ndb/test/ndbapi/testNodeRestart.cpp

@@ -887,6 +887,9 @@ int runBug20185(NDBT_Context* ctx, NDBT_Step* step){
     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 @@ int runBug20185(NDBT_Context* ctx, NDBT_Step* step){
     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);
   

storage/ndb/test/ndbapi/test_event.cpp

@@ -842,11 +842,12 @@ int runEventListenerUntilStopped(NDBT_Context* ctx, NDBT_Step* step)
   int result = NDBT_OK;
   const NdbDictionary::Table * table= ctx->getTab();
   HugoTransactions hugoTrans(* table);
+  Ndb* ndb= GETNDB(step);
 
   char buf[1024];
   sprintf(buf, "%s_EVENT", table->getName());
   NdbEventOperation *pOp, *pCreate = 0;
-  pCreate = pOp = GETNDB(step)->createEventOperation(buf);
+  pCreate = pOp = ndb->createEventOperation(buf);
   if ( pOp == NULL ) {
     g_err << "Event operation creation failed on %s" << buf << endl;
     return NDBT_FAILED;
@@ -870,7 +871,6 @@ int runEventListenerUntilStopped(NDBT_Context* ctx, NDBT_Step* step)
     goto end;
   }
   
-  Ndb* ndb= GETNDB(step);
   while(!ctx->isTestStopped())
   {
     Uint64 curr_gci = 0;
@@ -887,10 +887,10 @@ int runEventListenerUntilStopped(NDBT_Context* ctx, NDBT_Step* step)
 end:
   if(pCreate)
   {
-    if (GETNDB(step)->dropEventOperation(pCreate)) {
+    if (ndb->dropEventOperation(pCreate)) {
       g_err << "dropEventOperation execution failed "
-	    << GETNDB(step)->getNdbError().code << " "
-	    << GETNDB(step)->getNdbError().message << endl;
+	    << ndb->getNdbError().code << " "
+	    << ndb->getNdbError().message << endl;
       result = NDBT_FAILED;
     }
   }

storage/ndb/test/run-test/daily-devel-tests.txt

@@ -204,17 +204,17 @@ cmd: testSystemRestart
 args: -l 1 -n SR9 T1 
 
 #
-max-time: 2500
+max-time: 3600
 cmd: test_event
 args: -n EventOperationApplier -l 2
 
 #
-max-time: 2500
+max-time: 3600
 cmd: test_event
 args: -n EventOperationApplier_NR -l 2
 
 #
-max-time: 2500
+max-time: 3600
 cmd: test_event
 args: -n MergeEventOperationApplier_NR -l 2
 
@@ -224,9 +224,9 @@ cmd: test_event
 args: -n Multi
 
 #
-max-time: 2500
+max-time: 3600
 cmd: test_event
-args: -n CreateDropNR -l 2
+args: -n CreateDropNR -l 1
 
 #
 max-time: 600