ndb - merge error

note bug#15629 has been fixed in release clone (sp on 64 bit platform), but not merged here yet

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

@@ -3765,6 +3765,11 @@ void Dbdih::execNODE_FAILREP(Signal* signal)
   /*------------------------------------------------------------------------*/
   // Verify that a starting node has also crashed. Reset the node start record.
   /*-------------------------------------------------------------------------*/
+#if 0
+  /**
+   * Node will crash by itself...
+   *   nodeRestart is run then...
+   */
   if (false && c_nodeStartMaster.startNode != RNIL && getNodeStatus(c_nodeStartMaster.startNode) == NodeRecord::ALIVE)
   {
     BlockReference cntrRef = calcNdbCntrBlockRef(c_nodeStartMaster.startNode);
@@ -3776,6 +3781,7 @@ void Dbdih::execNODE_FAILREP(Signal* signal)
     sendSignal(cntrRef, GSN_SYSTEM_ERROR, signal,  SystemError::SignalLength, JBA);
     nodeResetStart();  
   }//if
+#endif
 
   /*--------------------------------------------------*/
   /*                                                  */