bzr push into mysql-5.1-telco-6.3 branch (jonas.oreland:3449 to 3450) Bug#62206

[jonas oreland]

 3450 jonas oreland	2011-08-19
      ndb - bug#62206 - nr - startGci should not be bigger than stopGci

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
 3449 jonas oreland	2011-07-08
      ndb - baah...variable is renamed between 63 and 70 :-(

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2011-02-01 21:05:11 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2011-08-19 07:53:05 +0000
@@ -3659,6 +3659,8 @@ done:
     ndbassert(gci == restorableGCI);
     replicaPtr.p->m_restorable_gci = gci;
     Uint32 startGci = replicaPtr.p->maxGciCompleted[maxLcpIndex] + 1;
+    if (startGci > gci)
+      startGci = gci;
     ndbout_c("Found LCP: %d(%d) maxGciStarted: %d maxGciCompleted: %d restorable: %d(%d) newestRestorableGCI: %d",
 	     maxLcpId,
 	     maxLcpIndex,

No bundle (reason: useless for push emails).