ndb - bug#15632

arg...also fix starting node...(version 6)

ndb - bug#15632
arg...also fix starting node...(version 6)
6a52626d · jonas@eel.(none) · e8cc3c4f · 6a52626d
Commit 6a52626d authored Mar 02, 2007 by jonas@eel.(none)
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp +5 -2

No files found.
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
@@ -2282,8 +2282,11 @@ void Dbdih::execINCL_NODEREQ(Signal* signal)
    CRASH_INSERTION(7171);
    Uint32 masterVersion = getNodeInfo(refToNode(cmasterdihref)).m_version;
-    if ((NDB_VERSION_MAJOR == 4 && masterVersion >= NDBD_INCL_NODECONF_VERSION_4) ||
+    if ((NDB_VERSION_MAJOR == 4 && 
-	(NDB_VERSION_MAJOR == 5 && masterVersion >= NDBD_INCL_NODECONF_VERSION_5))
+	 masterVersion >= NDBD_INCL_NODECONF_VERSION_4) ||
+	(NDB_VERSION_MAJOR == 5 && 
+	 masterVersion >= NDBD_INCL_NODECONF_VERSION_5) ||
+	(NDB_VERSION_MAJOR > 5))
    {
      signal->theData[0] = getOwnNodeId();
      signal->theData[1] = getOwnNodeId();