mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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


storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
This commit is contained in:
unknown 2007-01-20 03:02:39 +01:00
commit dc635e5918
2 changed files with 44 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
View file

@ -454,6 +454,12 @@ private:
void recompute_version_info(Uint32 type, Uint32 version); void recompute_version_info(Uint32 type, Uint32 version);
void execNODE_VERSION_REP(Signal* signal); void execNODE_VERSION_REP(Signal* signal);
void sendApiVersionRep(Signal* signal, NodeRecPtr nodePtr); void sendApiVersionRep(Signal* signal, NodeRecPtr nodePtr);
void sendVersionedDb(NodeReceiverGroup rg,
GlobalSignalNumber gsn,
Signal* signal,
Uint32 length,
JobBufferLevel jbuf,
Uint32 minversion);
}; };
#endif #endif

62
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
View file

@ -2785,30 +2785,12 @@ void Qmgr::execAPI_REGREQ(Signal* signal)
recompute_version_info(type, version); recompute_version_info(type, version);
if (info.m_type[NodeInfo::DB].m_min_version >= NDBD_NODE_VERSION_REP) signal->theData[0] = apiNodePtr.i;
{ signal->theData[1] = version;
jam(); NodeReceiverGroup rg(QMGR, c_clusterNodes);
NodeReceiverGroup rg(QMGR, c_clusterNodes); rg.m_nodes.clear(getOwnNodeId());
rg.m_nodes.clear(getOwnNodeId()); sendVersionedDb(rg, GSN_NODE_VERSION_REP, signal, 2, JBB,
signal->theData[0] = apiNodePtr.i; NDBD_NODE_VERSION_REP);
signal->theData[1] = version;
sendSignal(rg, GSN_NODE_VERSION_REP, signal, 2, JBB);
}
else
{
Uint32 i = 0;
while((i = c_clusterNodes.find(i + 1)) != NdbNodeBitmask::NotFound)
{
jam();
if (i == getOwnNodeId())
continue;
if (getNodeInfo(i).m_version >= NDBD_NODE_VERSION_REP)
{
jam();
sendSignal(calcQmgrBlockRef(i), GSN_NODE_VERSION_REP, signal, 2,JBB);
}
}
}
signal->theData[0] = apiNodePtr.i; signal->theData[0] = apiNodePtr.i;
EXECUTE_DIRECT(NDBCNTR, GSN_API_START_REP, signal, 1); EXECUTE_DIRECT(NDBCNTR, GSN_API_START_REP, signal, 1);
@ -2816,6 +2798,38 @@ void Qmgr::execAPI_REGREQ(Signal* signal)
return; return;
}//Qmgr::execAPI_REGREQ() }//Qmgr::execAPI_REGREQ()
void
Qmgr::sendVersionedDb(NodeReceiverGroup rg,
GlobalSignalNumber gsn,
Signal* signal,
Uint32 length,
JobBufferLevel jbuf,
Uint32 minversion)
{
jam();
NodeVersionInfo info = getNodeVersionInfo();
if (info.m_type[NodeInfo::DB].m_min_version >= minversion)
{
jam();
sendSignal(rg, gsn, signal, length, jbuf);
}
else
{
jam();
Uint32 i = 0, cnt = 0;
while((i = rg.m_nodes.find(i + 1)) != NodeBitmask::NotFound)
{
jam();
if (getNodeInfo(i).m_version >= minversion)
{
jam();
cnt++;
sendSignal(numberToRef(rg.m_block, i), gsn, signal, length, jbuf);
}
}
ndbassert(cnt < rg.m_nodes.count());
}
}
void void
Qmgr::execAPI_VERSION_REQ(Signal * signal) { Qmgr::execAPI_VERSION_REQ(Signal * signal) {