Commit c8af5096 authored by unknown's avatar unknown
Browse files

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

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


sql/event.h:
  Auto merged
parents 46194c8f da63714e

storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+5 −1
Original line number Diff line number Diff line
@@ -771,10 +771,14 @@ void Dblqh::execREAD_NODESCONF(Signal* signal) 
    jam();

    if (NodeBitmask::get(readNodes->allNodes, i)) {

      jam();

      m_sr_nodes.set(i);

      cnodeData[ind]    = i;

      cnodeStatus[ind]  = NodeBitmask::get(readNodes->inactiveNodes, i);

      //readNodes->getVersionId(i, readNodes->theVersionIds) not used

      if (!NodeBitmask::get(readNodes->inactiveNodes, i))

      {

	jam();

	m_sr_nodes.set(i);

      }

      ind++;

    }//if

  }//for