summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorjonas@perch.ndb.mysql.com <>2005-12-13 19:21:02 +0100
committerjonas@perch.ndb.mysql.com <>2005-12-13 19:21:02 +0100
commit7db9b21297ad1295846c7c41872e425004806b73 (patch)
treeed15c2c5f8c774016c888ca960b9c0bd48fb6684 /storage
parent1ef416199a5547b9a5f94bd00dc7cf9c96a7b0c6 (diff)
downloadmariadb-git-7db9b21297ad1295846c7c41872e425004806b73.tar.gz
ndb - merge fix
Diffstat (limited to 'storage')
-rw-r--r--storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
index 280bbc59b5f..0f97bc3dfe4 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
@@ -3771,6 +3771,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);
@@ -3782,6 +3787,7 @@ void Dbdih::execNODE_FAILREP(Signal* signal)
sendSignal(cntrRef, GSN_SYSTEM_ERROR, signal, SystemError::SignalLength, JBA);
nodeResetStart();
}//if
+#endif
/*--------------------------------------------------*/
/* */