From: jonas
Date: December 13 2005 1:41pm
Subject: bk commit into 5.0 tree (jonas:1.1975) BUG#15629
List-Archive: http://lists.mysql.com/commits/110
X-Bug: 15629
Message-Id: <20051213134132.A2EB21ECDD3@perch.ndb.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1975 05/12/13 14:41:28 jonas@stripped +1 -0
  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
    1.39 05/12/13 14:41:25 jonas@stripped +6 -0
    merge error

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.0-push

--- 1.38/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-12-13 11:51:01 +01:00
+++ 1.39/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-12-13 14:41:25 +01:00
@@ -3765,6 +3765,11 @@
   /*------------------------------------------------------------------------*/
   // 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 @@
     sendSignal(cntrRef, GSN_SYSTEM_ERROR, signal,  SystemError::SignalLength, JBA);
     nodeResetStart();  
   }//if
+#endif
 
   /*--------------------------------------------------*/
   /*                                                  */