List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:October 25 2010 6:35pm
Subject:bzr commit into mysql-5.1-telco-7.0 branch (jonas:3897)
View as plain text  
#At file:///home/jonas/src/telco-7.0/ based on revid:magnus.blaudd@stripped

 3897 Jonas Oreland	2010-10-25 [merge]
      ndb - merge 63 to 70

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2010-10-20 09:49:55 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2010-10-25 18:35:08 +0000
@@ -231,7 +231,6 @@ Dbdih::sendSUB_GCP_COMPLETE_REP(Signal* 
   {
     jam();
     c_SUB_GCP_COMPLETE_REP_Counter.clearWaitingFor(nodeId);
-    return;
   }
   BlockReference ref = calcDihBlockRef(nodeId);
   sendSignal(ref, GSN_SUB_GCP_COMPLETE_REP, signal,
@@ -10041,6 +10040,13 @@ Dbdih::execSUB_GCP_COMPLETE_REP(Signal* 
   sendSignal(DBLQH_REF, GSN_SUB_GCP_COMPLETE_REP, signal,
              signal->length(), JBB);
 reply:
+  Uint32 nodeId = refToNode(masterRef);
+  if (!ndbd_dih_sub_gcp_complete_ack(getNodeInfo(nodeId).m_version))
+  {
+    jam();
+    return;
+  }
+
   SubGcpCompleteAck* ack = CAST_PTR(SubGcpCompleteAck,
                                     signal->getDataPtrSend());
   ack->rep = rep;


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20101025183508-tr5thq2ogue0ilmm.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (jonas:3897) Jonas Oreland25 Oct