Commit ee3fde4e authored by unknown's avatar unknown

ndb - bug#15632

  fix testNodeRestart -n Bug15632
  handle version > 5


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  fix testNodeRestart -n Bug15632
  handle version > 5
parent 3fcc6915
...@@ -2035,8 +2035,11 @@ void Dbdih::gcpBlockedLab(Signal* signal) ...@@ -2035,8 +2035,11 @@ void Dbdih::gcpBlockedLab(Signal* signal)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
Uint32 startVersion = getNodeInfo(c_nodeStartMaster.startNode).m_version; Uint32 startVersion = getNodeInfo(c_nodeStartMaster.startNode).m_version;
if ((getMajor(startVersion) == 4 && startVersion >= NDBD_INCL_NODECONF_VERSION_4) || if ((getMajor(startVersion) == 4 &&
(getMajor(startVersion) == 5 && startVersion >= NDBD_INCL_NODECONF_VERSION_5)) startVersion >= NDBD_INCL_NODECONF_VERSION_4) ||
(getMajor(startVersion) == 5 &&
startVersion >= NDBD_INCL_NODECONF_VERSION_5) ||
(getMajor(startVersion) > 5))
{ {
c_INCL_NODEREQ_Counter.setWaitingFor(c_nodeStartMaster.startNode); c_INCL_NODEREQ_Counter.setWaitingFor(c_nodeStartMaster.startNode);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment