post merge fixes

bd7a5740 · jonas@perch.ndb.mysql.com · 40d83bdf · bd7a5740
Commit bd7a5740 authored Apr 06, 2006 by jonas@perch.ndb.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

ndb/src/kernel/blocks/qmgr/QmgrMain.cpp ndb/src/kernel/blocks/qmgr/QmgrMain.cpp +3 -1

No files found.
--- a/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
+++ b/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
@@ -2474,9 +2474,11 @@ void Qmgr::execDISCONNECT_REP(Signal* signal)
  ptrCheckGuard(nodePtr, MAX_NODES, nodeRec);

  char buf[100];
-  if (getNodeState().startLevel < NodeState::SL_STARTED)
+  if (getNodeInfo(nodeId).getType() == NodeInfo::DB &&
+      getNodeState().startLevel < NodeState::SL_STARTED)
  {
    jam();
+    CRASH_INSERTION(932);
    BaseString::snprintf(buf, 100, "Node %u disconected", nodeId);    
    progError(__LINE__, NDBD_EXIT_SR_OTHERNODEFAILED, buf);
    ndbrequire(false);