diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-04-18 14:34:11 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-04-18 14:34:11 +0200 |
| commit | ffbda096fda4a2da67d7e885a79a0cee951bb886 (patch) | |
| tree | af1f1af638c95834fe6cbdd91f619d94c1499495 /ndb | |
| parent | 7d0d3fb2785ff4a8951892b5ba6e4c5a107b080f (diff) | |
| download | mariadb-git-ffbda096fda4a2da67d7e885a79a0cee951bb886.tar.gz | |
ndb -
fix api_signal_log print of uncond signals
ndb/src/ndbapi/Ndbif.cpp:
Send TC_COMMIT_ACK uncond
ndb/src/ndbapi/TransporterFacade.cpp:
Fix printout of uncond signals
ndb/src/ndbapi/TransporterFacade.hpp:
Fix printout of uncond signals
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/ndbapi/Ndbif.cpp | 4 | ||||
| -rw-r--r-- | ndb/src/ndbapi/TransporterFacade.cpp | 7 | ||||
| -rw-r--r-- | ndb/src/ndbapi/TransporterFacade.hpp | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/ndb/src/ndbapi/Ndbif.cpp b/ndb/src/ndbapi/Ndbif.cpp index d753117aa9a..f1433122ade 100644 --- a/ndb/src/ndbapi/Ndbif.cpp +++ b/ndb/src/ndbapi/Ndbif.cpp @@ -1354,6 +1354,6 @@ NdbConnection::sendTC_COMMIT_ACK(NdbApiSignal * aSignal, Uint32 * dataPtr = aSignal->getDataPtrSend(); dataPtr[0] = transId1; dataPtr[1] = transId2; - - tp->sendSignal(aSignal, refToNode(aTCRef)); + + tp->sendSignalUnCond(aSignal, refToNode(aTCRef)); } diff --git a/ndb/src/ndbapi/TransporterFacade.cpp b/ndb/src/ndbapi/TransporterFacade.cpp index 30d0eec1e4a..0369876f9d8 100644 --- a/ndb/src/ndbapi/TransporterFacade.cpp +++ b/ndb/src/ndbapi/TransporterFacade.cpp @@ -817,7 +817,7 @@ TransporterFacade::sendSignal(NdbApiSignal * aSignal, NodeId aNode){ LinearSectionPtr ptr[3]; signalLogger.sendSignal(* aSignal, 1, - aSignal->getDataPtr(), + tDataPtr, aNode, ptr, 0); signalLogger.flushSignalLog(); aSignal->theSendersBlockRef = tmp; @@ -844,6 +844,7 @@ TransporterFacade::sendSignal(NdbApiSignal * aSignal, NodeId aNode){ int TransporterFacade::sendSignalUnCond(NdbApiSignal * aSignal, NodeId aNode){ + Uint32* tDataPtr = aSignal->getDataPtrSend(); #ifdef API_TRACE if(setSignalLog() && TRACE_GSN(aSignal->theVerId_signalNumber)){ Uint32 tmp = aSignal->theSendersBlockRef; @@ -851,7 +852,7 @@ TransporterFacade::sendSignalUnCond(NdbApiSignal * aSignal, NodeId aNode){ LinearSectionPtr ptr[3]; signalLogger.sendSignal(* aSignal, 0, - aSignal->getDataPtr(), + tDataPtr, aNode, ptr, 0); signalLogger.flushSignalLog(); aSignal->theSendersBlockRef = tmp; @@ -862,7 +863,7 @@ TransporterFacade::sendSignalUnCond(NdbApiSignal * aSignal, NodeId aNode){ (aSignal->theReceiversBlockNumber != 0)); SendStatus ss = theTransporterRegistry->prepareSend(aSignal, 0, - aSignal->getDataPtr(), + tDataPtr, aNode, 0); diff --git a/ndb/src/ndbapi/TransporterFacade.hpp b/ndb/src/ndbapi/TransporterFacade.hpp index 1e7377a3b4d..7e010d45945 100644 --- a/ndb/src/ndbapi/TransporterFacade.hpp +++ b/ndb/src/ndbapi/TransporterFacade.hpp @@ -128,7 +128,8 @@ private: friend class GrepSS; friend class Ndb; friend class Ndb_cluster_connection_impl; - + friend class NdbConnection; + int sendSignalUnCond(NdbApiSignal *, NodeId nodeId); bool isConnected(NodeId aNodeId); |