List:Commits« Previous MessageNext Message »
From:jonas Date:August 12 2008 11:47am
Subject:bzr push into mysql-5.1 branch (jonas:2647)
View as plain text  
 2647 jonas@stripped	2008-08-12
      ndb -
        make SignalSender (used by ndb_mgmd) do forceSend
        this to remove race-condition introduced in e.g testDict -n FailAddFragment
        after magnus BufferedSocketOutput patch
modified:
  storage/ndb/src/ndbapi/TransporterFacade.cpp

=== modified file 'storage/ndb/src/ndbapi/TransporterFacade.cpp'
--- a/storage/ndb/src/ndbapi/TransporterFacade.cpp	2007-11-20 14:08:40 +0000
+++ b/storage/ndb/src/ndbapi/TransporterFacade.cpp	2008-08-12 09:40:26 +0000
@@ -1546,9 +1546,18 @@ SignalSender::sendSignal(Uint16 nodeId, 
 #endif
   assert(getNodeInfo(nodeId).m_api_reg_conf == true ||
          s->readSignalNumber() == GSN_API_REGREQ);
-  return theFacade->theTransporterRegistry->prepareSend(&s->header,
-							1, // JBB
-							&s->theData[0],
-							nodeId, 
-							&s->ptr[0]);
+  
+  SendStatus ss = 
+    theFacade->theTransporterRegistry->prepareSend(&s->header,
+                                                   1, // JBB
+                                                   &s->theData[0],
+                                                   nodeId, 
+                                                   &s->ptr[0]);
+
+  if (ss == SEND_OK)
+  {
+    theFacade->forceSend(m_blockNo);
+  }
+
+  return ss;
 }

Thread
bzr push into mysql-5.1 branch (jonas:2647) jonas12 Aug