Commit dfa9a764 authored by unknown's avatar unknown
Browse files

ndb: removed TransporterFacade singleton

parent 0fcf49b4

storage/ndb/include/ndbapi/NdbTransaction.hpp

+1 −1
Original line number Diff line number Diff line
@@ -792,7 +792,7 @@ private: 
  bool theBlobFlag;

  Uint8 thePendingBlobOps;



  static void sendTC_COMMIT_ACK(NdbApiSignal *,

  static void sendTC_COMMIT_ACK(class TransporterFacade *, NdbApiSignal *,

				Uint32 transId1, Uint32 transId2, 

				Uint32 aBlockRef);

storage/ndb/src/mgmsrv/MgmtSrvr.cpp

+1 −2
Original line number Diff line number Diff line
@@ -560,8 +560,7 @@ MgmtSrvr::start(BaseString &error_string) 
      DBUG_RETURN(false);

    }

  }

  theFacade= TransporterFacade::theFacadeInstance

    = new TransporterFacade();

  theFacade= new TransporterFacade();

  

  if(theFacade == 0) {

    DEBUG("MgmtSrvr.cpp: theFacade is NULL.");

storage/ndb/src/ndbapi/Ndb.cpp

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ Ndb::NDB_connect(Uint32 tNode) 
//***************************************************************************

  

  int	         tReturnCode;

  TransporterFacade *tp = TransporterFacade::instance();

  TransporterFacade *tp = theImpl->m_transporter_facade;



  DBUG_ENTER("Ndb::NDB_connect");
@@ -609,7 +609,7 @@ Ndb::NdbTamper(TamperType aAction, int aNode) 
  tSignal.setData(tNdbConn->ptr2int(),2);

  tSignal.setData(theMyRef,3);		// Set return block reference

  tNdbConn->Status(NdbTransaction::Connecting); // Set status to connecting

  TransporterFacade *tp = TransporterFacade::instance();

  TransporterFacade *tp = theImpl->m_transporter_facade;

  if (tAction == 3) {

    tp->lock_mutex();

    tp->sendSignal(&tSignal, aNode);

storage/ndb/src/ndbapi/NdbImpl.hpp

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public: 
  Ndb &m_ndb;



  Ndb_cluster_connection_impl &m_ndb_cluster_connection;

  TransporterFacade *m_transporter_facade;



  NdbDictionaryImpl m_dictionary;

storage/ndb/src/ndbapi/NdbOperationExec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ NdbOperation::doSend(int aNodeId, Uint32 lastFlag) 
  int tSignalCount = 0;

  assert(theTCREQ != NULL);

  setLastFlag(theTCREQ, lastFlag);

  TransporterFacade *tp = TransporterFacade::instance();

  TransporterFacade *tp = theNdb->theImpl->m_transporter_facade;

  tReturnCode = tp->sendSignal(theTCREQ, aNodeId);

  tSignalCount++;

  if (tReturnCode == -1) {