From: Date: May 28 2009 8:03am
Subject: bzr commit into mysql-5.1-telco-6.3 branch (jonas:2978) Bug#25984
List-Archive: http://lists.mysql.com/commits/75101
X-Bug: 25984
Message-Id: <20090528060331.4E3F3983DF1@perch.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_YOaKpjJMDH2u23jhNBAmmg)"

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

#At file:///home/jonas/src/telco-6.3/ based on revid:bocklin@stripped

 2978 Jonas Oreland	2009-05-28
      ndb - fix bug#25984 - that broke

    M  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    M  storage/ndb/test/ndbapi/testNodeRestart.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2009-05-27 12:11:46 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2009-05-28 06:03:13 +0000
@@ -9745,7 +9745,12 @@ Dbdih::resetReplicaSr(TabRecordPtr tabPt
 	     * A COMPLETELY NEW REPLICA. WE WILL SET THE CREATE GCI TO BE THE 
 	     * NEXT GCI TO BE EXECUTED.                                       
 	     *--------_----------------------------------------------------- */
-	    const Uint32 nextCrashed = noCrashedReplicas + 1;
+            if (noCrashedReplicas + 1 == MAX_CRASHED_REPLICAS)
+            {
+              jam();
+              packCrashedReplicas(replicaPtr);
+            }
+	    const Uint32 nextCrashed = replicaPtr.p->noCrashedReplicas + 1;
 	    replicaPtr.p->noCrashedReplicas = nextCrashed;
 	    arrGuardErr(nextCrashed, MAX_CRASHED_REPLICAS, NDBD_EXIT_MAX_CRASHED_REPLICAS);
 	    replicaPtr.p->createGci[nextCrashed] = newestRestorableGCI + 1;

=== modified file 'storage/ndb/test/ndbapi/testNodeRestart.cpp'
--- a/storage/ndb/test/ndbapi/testNodeRestart.cpp	2009-05-27 12:11:46 +0000
+++ b/storage/ndb/test/ndbapi/testNodeRestart.cpp	2009-05-28 06:03:13 +0000
@@ -1324,10 +1324,16 @@ int runBug25554(NDBT_Context* ctx, NDBT_
 int runBug25984(NDBT_Context* ctx, NDBT_Step* step)
 {
   NdbRestarter restarter;
+  Ndb* pNdb = GETNDB(step);
+
+  NdbDictionary::Table tab = * ctx->getTab();
+  NdbDictionary::Dictionary* pDict = GETNDB(step)->getDictionary();
 
   if (restarter.getNumDbNodes() < 2)
     return NDBT_OK;
 
+  pDict->dropTable(tab.getName());
+
   if (restarter.restartAll(true, true, true))
     return NDBT_FAILED;
 
@@ -1340,6 +1346,14 @@ int runBug25984(NDBT_Context* ctx, NDBT_
   if (restarter.waitClusterStarted())
     return NDBT_FAILED;
 
+  int res = pDict->createTable(tab);
+  if (res)
+  {
+    return NDBT_FAILED;
+  }
+  HugoTransactions trans(* pDict->getTable(tab.getName()));
+  trans.loadTable(pNdb, ctx->getNumRecords());
+                         
   int val2[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };    
   int master = restarter.getMasterNodeId();
   int victim = restarter.getRandomNodeOtherNodeGroup(master, rand());
@@ -1359,6 +1373,8 @@ int runBug25984(NDBT_Context* ctx, NDBT_
     
     if (restarter.insertErrorInNode(victim, 7191))
       return NDBT_FAILED;
+
+    trans.scanUpdateRecords(pNdb, ctx->getNumRecords());
     
     if (restarter.startNodes(&victim, 1))
       return NDBT_FAILED;
@@ -1375,6 +1391,8 @@ int runBug25984(NDBT_Context* ctx, NDBT_
   if (restarter.waitClusterStarted())
     return NDBT_FAILED;
 
+  trans.scanUpdateRecords(pNdb, ctx->getNumRecords());
+
   restarter.restartOneDbNode(victim, false, true, true);
   for (Uint32 i = 0; i<1; i++)
   {
@@ -1387,7 +1405,9 @@ int runBug25984(NDBT_Context* ctx, NDBT_
     
     if (restarter.insertErrorInNode(victim, 7016))
       return NDBT_FAILED;
-    
+  
+    trans.scanUpdateRecords(pNdb, ctx->getNumRecords());
+  
     if (restarter.startNodes(&victim, 1))
       return NDBT_FAILED;
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@stripped
# target_branch: file:///home/jonas/src/telco-6.3/
# testament_sha1: 7783b7ca7c55af2cfc649e11f95d94fd2c706ef7
# timestamp: 2009-05-28 08:03:31 +0200
# source_branch: file:///home/jonas/src/telco-6.2/
# base_revision_id: bocklin@stripped\
#   20090527121146-m7k9086oln1s4kvt
# 
# Begin bundle
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
UJBfsbLC


--Boundary_(ID_YOaKpjJMDH2u23jhNBAmmg)--