ndb - bug#16447

  correct return value in check_cm_cmregreq


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Fix bug in bug#16447
ndb/test/src/NdbRestarts.cpp:
  Fix bug in test program

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

@@ -848,10 +848,12 @@ Qmgr::check_cmregreq_reply(Signal* signal, Uint32 nodeId, Uint32 gsn)
     goto die_direct;
   }
   
-  return false;
+  return true;
 
 die_direct:
   ndbout_c(buf);
+  CRASH_INSERTION(932);
+  
   progError(__LINE__, 
 	    ERR_ARBIT_SHUTDOWN, 
 	    buf);
@@ -2082,9 +2084,13 @@ void Qmgr::execDISCONNECT_REP(Signal* signal)
   case ZFAIL_CLOSING:
   case ZAPI_ACTIVE:
   case ZAPI_INACTIVE:
+  {
+    char buf[100];
+    BaseString::snprintf(buf, 100, "Node %u disconected", nodeId);    
+    progError(__LINE__, ERR_SR_OTHERNODEFAILED, buf);
     ndbrequire(false);
   }
-
+  }
   node_failed(signal, nodeId);
 }//DISCONNECT_REP
 

ndb/test/src/NdbRestarts.cpp

@@ -445,8 +445,7 @@ int twoNodeFailure(NdbRestarter& _restarter,
 	 << ") secs " << endl;
   NdbSleep_SecSleep(seconds);
 
-  randomId = (rand() % _restarter.getNumDbNodes());
-  nodeId = _restarter.getDbNodeId(randomId);  
+  nodeId = _restarter.getRandomNodeOtherNodeGroup(nodeId, rand());
   g_info << _restart->m_name << ": node = "<< nodeId << endl;
 
   CHECK(_restarter.insertErrorInNode(nodeId, 9999) == 0,