Commit 7a098d1a 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/kernel/blocks/qmgr/Qmgr.hpp:
  merge
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  merge
parents 7c68b5d7 4c4afd22

storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp

+2 −2
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ private: 
  struct OpAllocNodeIdReq opAllocNodeIdReq;

  

  StopReq c_stopReq;

  void check_multi_node_shutdown(Signal* signal);

  bool check_multi_node_shutdown(Signal* signal);

};



#endif

storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp

+15 −5
Original line number Diff line number Diff line
@@ -2766,7 +2766,11 @@ void Qmgr::failReportLab(Signal* signal, Uint16 aFailedNode, 
  ptrCheckGuard(failedNodePtr, MAX_NODES, nodeRec);

  FailRep* rep = (FailRep*)signal->getDataPtr();



  check_multi_node_shutdown(signal);

  if (check_multi_node_shutdown(signal))

  {

    jam();

    return;

  }

  

  if (failedNodePtr.i == getOwnNodeId()) {

    jam();
@@ -2835,8 +2839,8 @@ void Qmgr::failReportLab(Signal* signal, Uint16 aFailedNode, 
			 "We(%u) have been declared dead by %u reason: %s(%u)",

			 getOwnNodeId(),

			 refToNode(signal->getSendersBlockRef()),

			 aFailCause,

			 msg ? msg : "<Unknown>");

			 msg ? msg : "<Unknown>",

			 aFailCause);

    

    progError(__LINE__, code, buf);

    return;
@@ -2896,7 +2900,11 @@ void Qmgr::execPREP_FAILREQ(Signal* signal) 
  NodeRecPtr myNodePtr;

  jamEntry();

  

  check_multi_node_shutdown(signal);

  if (check_multi_node_shutdown(signal))

  {

    jam();

    return;

  }

  

  PrepFailReqRef * const prepFail = (PrepFailReqRef *)&signal->theData[0];
@@ -4897,7 +4905,7 @@ Qmgr::execSTOP_REQ(Signal* signal) 
  }

}



void

bool

Qmgr::check_multi_node_shutdown(Signal* signal)

{

  if (c_stopReq.senderRef &&
@@ -4913,5 +4921,7 @@ Qmgr::check_multi_node_shutdown(Signal* signal) 
    } else {

      EXECUTE_DIRECT(CMVMI, GSN_STOP_ORD, signal, 1);

    }

    return true;

  }

  return false;

}