bk commit into 5.1 tree (jonas:1.2691)

[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-23 13:39:41+01:00, jonas@stripped +1 -0
  ndb - 2lcp
    Check nextReplica on SR
    so we dont accidently start using >= 3 LCP again

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-11-23 13:39:37+01:00, jonas@stripped +8 -0
    Check nextReplica on SR
      so we dont accidently start using >= 3 LCP again

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-20 18:28:52 +01:00
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-11-23 13:39:37 +01:00
@@ -13759,6 +13759,14 @@ void Dbdih::readReplica(RWFragment* rf, 
     jam();
     readReplicaPtr.p->lcpStatus[trraLcp] = ZINVALID;
   }//if
+
+  if (readReplicaPtr.p->nextLcp >= MAX_LCP_USED)
+  {
+    jam();
+    infoEvent("Updating nextLcp from %u to %u", readReplicaPtr.p->nextLcp, 0);
+    readReplicaPtr.p->nextLcp = 0;
+  }
+
   /* ---------------------------------------------------------------------- */
   /*       WE ALSO HAVE TO INVALIDATE ANY LOCAL CHECKPOINTS THAT HAVE BEEN  */
   /*       INVALIDATED BY MOVING BACK THE RESTART GCI.                      */