diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2005-12-13 14:41:28 +0100 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2005-12-13 14:41:28 +0100 |
| commit | 2bec1f7e08cfa0f9a52a4a526d11c6de5b4a123a (patch) | |
| tree | ecc7fa5f7cabd40f59e87b8c9b395aee15e52d1a | |
| parent | 88b65dd29e800e11fff7cbc17341f1633049fe3b (diff) | |
| download | mariadb-git-2bec1f7e08cfa0f9a52a4a526d11c6de5b4a123a.tar.gz | |
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:
merge error
| -rw-r--r-- | ndb/src/kernel/blocks/dbdih/DbdihMain.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp index c1e90dccf12..1ab606758e6 100644 --- a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp +++ b/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 /*--------------------------------------------------*/ /* */ |