Commit 3b53ec82 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-work 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
parents 6ad7d664 039a5f41

storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

+10 −4
Original line number Diff line number Diff line
@@ -2098,8 +2098,11 @@ void Dbdih::gcpBlockedLab(Signal* signal) 
  /*-------------------------------------------------------------------------*/

  Uint32 startVersion = getNodeInfo(c_nodeStartMaster.startNode).m_version;

  

  if ((getMajor(startVersion) == 4 && startVersion >= NDBD_INCL_NODECONF_VERSION_4) ||

      (getMajor(startVersion) == 5 && startVersion >= NDBD_INCL_NODECONF_VERSION_5))

  if ((getMajor(startVersion) == 4 && 

       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);

  }
@@ -2342,8 +2345,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();