bzr commit into mysql-5.1-telco-6.3 branch (jonas:3265) Bug#55641

[Jonas Oreland]

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

 3265 Jonas Oreland	2010-08-26
      ndb - bug#55641 - fix upgrade...daa

    modified:
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
=== modified file 'storage/ndb/src/kernel/blocks/suma/Suma.cpp'
--- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2010-08-26 09:00:51 +0000
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2010-08-26 10:07:24 +0000
@@ -4818,6 +4818,11 @@ Suma::execSUMA_HANDOVER_REQ(Signal* sign
   Uint32 nodeId = req->nodeId;
   Uint32 new_gci = (m_last_complete_gci >> 32) + MAX_CONCURRENT_GCP + 1;
   Uint32 requestType = req->requestType;
+  if (!ndbd_suma_stop_me(getNodeInfo(nodeId).m_version))
+  {
+    jam();
+    requestType = SumaHandoverReq::RT_START_NODE;
+  }
   
   Uint32 start_gci = (gci > new_gci ? gci : new_gci);
   // mark all active buckets really belonging to restarting SUMA
@@ -4924,6 +4929,12 @@ Suma::execSUMA_HANDOVER_CONF(Signal* sig
   ndbout_c("Suma::execSUMA_HANDOVER_CONF, gci = %u", gci);
 #endif
 
+  if (!ndbd_suma_stop_me(getNodeInfo(nodeId).m_version))
+  {
+    jam();
+    requestType = SumaHandoverReq::RT_START_NODE;
+  }
+
   if (requestType == SumaHandoverReq::RT_START_NODE)
   {
     jam();


Attachment: [text/bzr-bundle] bzr/[e-mail]