summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorunknown <jonas@eel.(none)>2007-03-02 19:08:58 +0100
committerunknown <jonas@eel.(none)>2007-03-02 19:08:58 +0100
commit039a5f411a3fecbbb9bb4548f16f2282e51b5b01 (patch)
treef87c9c26d92a5867283745fa887dce18e7c3586c /storage
parentee3fde4e97c06cd052c46324fee962896514c051 (diff)
downloadmariadb-git-039a5f411a3fecbbb9bb4548f16f2282e51b5b01.tar.gz
ndb - bug#15632
arg...also fix starting node...(version 6) storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: arg...also fix starting node...
Diffstat (limited to 'storage')
-rw-r--r--storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
index eafd37b1a79..cd9b6a9a91d 100644
--- 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) ||
- (NDB_VERSION_MAJOR == 5 && masterVersion >= NDBD_INCL_NODECONF_VERSION_5))
+ if ((NDB_VERSION_MAJOR == 4 &&
+ 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();