bk commit into 5.1 tree (jonas:1.2572)

[jonas]

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@stripped, 2007-07-02 14:06:47+02:00, jonas@stripped +3 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
  into  perch.ndb.mysql.com:/home/jonas/src/telco-6.1
  MERGE: 1.2403.9.73

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2007-07-02 14:05:22+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.131.1.5

  storage/ndb/test/ndbapi/testNodeRestart.cpp@stripped, 2007-07-02 14:05:22+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.36.1.14

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-07-02 14:06:42+02:00, jonas@stripped +2 -2
    merge
    MERGE: 1.61.1.17

# 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/telco-6.1/RESYNC

--- 1.81/storage/ndb/test/run-test/daily-basic-tests.txt	2007-07-02 14:06:52 +02:00
+++ 1.82/storage/ndb/test/run-test/daily-basic-tests.txt	2007-07-02 14:06:52 +02:00
@@ -561,6 +561,10 @@
 cmd: testNodeRestart
 args: -n Bug28023 T7 D2
 
+max-time: 1000
+cmd: testNodeRestart
+args: -n Bug29364 T1
+
 #
 # DICT TESTS
 max-time: 1500

--- 1.137/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-07-02 14:06:52 +02:00
+++ 1.138/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-07-02 14:06:52 +02:00
@@ -10119,6 +10119,7 @@
     hostptr.p->noOfWordsTCINDXCONF = 0;
     hostptr.p->noOfPackedWordsLqh = 0;
     hostptr.p->hostLqhBlockRef = calcLqhBlockRef(hostptr.i);
+    hostptr.p->m_nf_bits = 0;
   }//for
   c_alive_nodes.clear();
 }//Dbtc::inithost()

--- 1.50/storage/ndb/test/ndbapi/testNodeRestart.cpp	2007-07-02 14:06:52 +02:00
+++ 1.51/storage/ndb/test/ndbapi/testNodeRestart.cpp	2007-07-02 14:06:52 +02:00
@@ -963,12 +963,62 @@
     
     restarter.startNodes(&nodeId, 1);
     
-    for (Uint32 i = 0; i < 100; i++)
-    {
-      hugoTrans.pkReadRecords(pNdb, 100, 1, NdbOperation::LM_CommittedRead);
-    }
-    
+    do {
+      for (Uint32 i = 0; i < 100; i++)
+      {
+        hugoTrans.pkReadRecords(pNdb, 100, 1, NdbOperation::LM_CommittedRead);
+      }
+    } while (restarter.waitClusterStarted(5) != 0);
+  }
+  
+  return NDBT_OK;
+}
+
+int 
+runBug29364(NDBT_Context* ctx, NDBT_Step* step){
+  int result = NDBT_OK;
+  int loops = ctx->getNumLoops();
+  int records = ctx->getNumRecords();
+  NdbRestarter restarter;
+  Ndb* pNdb = GETNDB(step);
+  
+  HugoTransactions hugoTrans(*ctx->getTab());
+
+  if (restarter.getNumDbNodes() < 4)
+    return NDBT_OK;
+
+  int dump0[] = { 9000, 0 } ;
+  int dump1[] = { 9001, 0 } ;
+  Uint32 ownNode = refToNode(pNdb->getReference());
+  dump0[1] = ownNode;
+
+  for (; loops; loops --)
+  {
+    int node0 = restarter.getDbNodeId(rand() % restarter.getNumDbNodes());
+    int node1 = restarter.getRandomNodeOtherNodeGroup(node0, rand());
+
+    restarter.restartOneDbNode(node0, false, true, true);
+    restarter.waitNodesNoStart(&node0, 1);
+    restarter.startNodes(&node0, 1);
     restarter.waitClusterStarted();
+
+    restarter.restartOneDbNode(node1, false, true, true);    
+    restarter.waitNodesNoStart(&node1, 1);
+    if (restarter.dumpStateOneNode(node1, dump0, 2))
+      return NDBT_FAILED;
+
+    restarter.startNodes(&node1, 1);    
+    
+    do {
+      
+      for (Uint32 i = 0; i < 100; i++)
+      {
+        hugoTrans.pkReadRecords(pNdb, 100, 1, NdbOperation::LM_CommittedRead);
+      }
+    } while (restarter.waitClusterStarted(5) != 0);
+    
+    if (restarter.dumpStateOneNode(node1, dump1, 1))
+      return NDBT_FAILED;
   }
   
   return NDBT_OK;
@@ -1980,6 +2030,9 @@
 }
 TESTCASE("Bug28717", ""){
   INITIALIZER(runBug28717);
+}
+TESTCASE("Bug29364", ""){
+  INITIALIZER(runBug29364);
 }
 NDBT_TESTSUITE_END(testNodeRestart);