Commit 32b71c76 authored by unknown's avatar unknown
Browse files

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

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


storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  merge
parents 24a3ce9c 535eeb5b

storage/ndb/src/ndbapi/Ndbif.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1435,8 +1435,7 @@ NdbTransaction::sendTC_COMMIT_ACK(TransporterFacade *tp, 
  Uint32 * dataPtr = aSignal->getDataPtrSend();

  dataPtr[0] = transId1;

  dataPtr[1] = transId2;



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

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

}



int

storage/ndb/src/ndbapi/TransporterFacade.cpp

+4 −3
Original line number Diff line number Diff line
@@ -987,7 +987,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;
@@ -1014,6 +1014,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;
@@ -1021,7 +1022,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;
@@ -1032,7 +1033,7 @@ TransporterFacade::sendSignalUnCond(NdbApiSignal * aSignal, NodeId aNode){ 
         (aSignal->theReceiversBlockNumber != 0));

  SendStatus ss = theTransporterRegistry->prepareSend(aSignal, 

						      0, 

						      aSignal->getDataPtr(), 

						      tDataPtr,

						      aNode, 

						      0);

storage/ndb/src/ndbapi/TransporterFacade.hpp

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

  friend class Ndb;

  friend class Ndb_cluster_connection_impl;

  friend class NdbTransaction;

  

  int sendSignalUnCond(NdbApiSignal *, NodeId nodeId);