bk commit into 5.1 tree (jonas:1.2587)

[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-09-05 14:17:56+02:00, jonas@stripped +1 -0
  ndb - micro
  Make sure that GCP_SAVE can continue after master gcp take-over
      (due to newly added wait)

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-09-05 14:17:52+02:00, jonas@stripped +12 -0
    Make sure that GCP_SAVE can continue after master gcp take-over
    (due to newly added wait)

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-09-05 13:12:08 +02:00
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-09-05 14:17:52 +02:00
@@ -5542,6 +5542,18 @@ void Dbdih::MASTER_GCPhandling(Signal* s
   }
   ndbassert(ok);
 
+  {
+    Uint32 saveGCI = Uint32(m_micro_gcp.m_next_gci >> 32);
+    if (m_gcp_save.m_gci + 1 == saveGCI)
+    {
+      jam();
+      /**
+       * Make sure that GCP save can continue...
+       */
+      m_micro_gcp.m_next_gci = (Uint64(saveGCI) + 1) << 32;
+    }
+  }
+
   ok = false;
   switch(m_gcp_save.m_master_state){
   case GcpSave::GCP_SAVE_IDLE: