Commit a923367f authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com

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

into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
parents 1246d2a2 087f5731
...@@ -771,10 +771,14 @@ void Dblqh::execREAD_NODESCONF(Signal* signal) ...@@ -771,10 +771,14 @@ void Dblqh::execREAD_NODESCONF(Signal* signal)
jam(); jam();
if (NodeBitmask::get(readNodes->allNodes, i)) { if (NodeBitmask::get(readNodes->allNodes, i)) {
jam(); jam();
m_sr_nodes.set(i);
cnodeData[ind] = i; cnodeData[ind] = i;
cnodeStatus[ind] = NodeBitmask::get(readNodes->inactiveNodes, i); cnodeStatus[ind] = NodeBitmask::get(readNodes->inactiveNodes, i);
//readNodes->getVersionId(i, readNodes->theVersionIds) not used //readNodes->getVersionId(i, readNodes->theVersionIds) not used
if (!NodeBitmask::get(readNodes->inactiveNodes, i))
{
jam();
m_sr_nodes.set(i);
}
ind++; ind++;
}//if }//if
}//for }//for
......
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