Commit ad2d268d authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/41-work 

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
parents 5bdf4ce4 e0218948

ndb/src/ndbapi/Ndbif.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1355,5 +1355,5 @@ NdbTransaction::sendTC_COMMIT_ACK(NdbApiSignal * aSignal, 
  dataPtr[0] = transId1;

  dataPtr[1] = transId2;

  

  tp->sendSignal(aSignal, refToNode(aTCRef));

  tp->sendSignalUnCond(aSignal, refToNode(aTCRef));

}

ndb/src/ndbapi/TransporterFacade.cpp

+4 −3
Original line number Diff line number Diff line
@@ -813,7 +813,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;
@@ -840,6 +840,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;
@@ -847,7 +848,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;
@@ -858,7 +859,7 @@ TransporterFacade::sendSignalUnCond(NdbApiSignal * aSignal, NodeId aNode){ 
         (aSignal->theReceiversBlockNumber != 0));

  SendStatus ss = theTransporterRegistry->prepareSend(aSignal, 

						      0, 

						      aSignal->getDataPtr(), 

						      tDataPtr,

						      aNode, 

						      0);

ndb/src/ndbapi/TransporterFacade.hpp

+2 −1
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ private: 
  friend class GrepSS;

  friend class Ndb;

  friend class Ndb_cluster_connection_impl;

  friend class NdbConnection;

  

  int sendSignalUnCond(NdbApiSignal *, NodeId nodeId);