bk commit into 5.1 tree (jonas:1.2692)

[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-11-26 14:11:40+01:00, jonas@stripped +1 -0
  Adopt nr_start_fragment for changes
    finding LCP

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-11-26 14:11:37+01:00, jonas@stripped +11 -5
    Adopt nr_start_fragment for changes
      finding LCP

diff -Nrup a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-11-23 13:39:37 +01:00
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-11-26 14:11:37 +01:00
@@ -3091,7 +3091,7 @@ Dbdih::nr_start_fragment(Signal* signal,
 			 TakeOverRecordPtr takeOverPtr,
 			 ReplicaRecordPtr replicaPtr)
 {
-  Uint32 i, j = 0;
+  Uint32 i;
   Uint32 maxLcpId = 0;
   Uint32 maxLcpIndex = ~0;
   
@@ -3102,14 +3102,16 @@ Dbdih::nr_start_fragment(Signal* signal,
 	   takeOverPtr.p->toCurrentFragid,
 	   replicaPtr.p->nextLcp);
   
+  Int32 j = replicaPtr.p->noCrashedReplicas - 1;
   Uint32 idx = prevLcpNo(replicaPtr.p->nextLcp);
   for(i = 0; i<MAX_LCP_USED; i++, idx = prevLcpNo(idx))
   {
-    ndbout_c("scanning idx: %d lcpId: %d", idx, replicaPtr.p->lcpId[idx]);
+    printf("scanning idx: %d lcpId: %d", idx, replicaPtr.p->lcpId[idx]);
     if (replicaPtr.p->lcpStatus[idx] == ZVALID) 
     {
       Uint32 stopGci = replicaPtr.p->maxGciStarted[idx];
-      for (;j < replicaPtr.p->noCrashedReplicas; j++)
+      ndbout_c(" %u", stopGci);
+      for (; j>= 0; j--)
       {
 	ndbout_c("crashed replica: %d(%d) replicaLastGci: %d",
 		 j, 
@@ -3124,14 +3126,18 @@ Dbdih::nr_start_fragment(Signal* signal,
 	}
       }
     }
+    else
+    {
+      ndbout_c("");
+    }
   }
   
   idx = 2; // backward compat code
-  ndbout_c("scanning idx: %d lcpId: %d", idx, replicaPtr.p->lcpId[idx]);
+  ndbout_c("- scanning idx: %d lcpId: %d", idx, replicaPtr.p->lcpId[idx]);
   if (replicaPtr.p->lcpStatus[idx] == ZVALID) 
   {
     Uint32 stopGci = replicaPtr.p->maxGciStarted[idx];
-    for (;j < replicaPtr.p->noCrashedReplicas; j++)
+    for (;j >= 0; j--)
     {
       ndbout_c("crashed replica: %d(%d) replicaLastGci: %d",
                j,