Commit df488730 authored by stewart@mysql.com's avatar stewart@mysql.com

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main

into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug15512
parents 56e35734 d54c878f
...@@ -2030,29 +2030,32 @@ void Qmgr::execAPI_REGREQ(Signal* signal) ...@@ -2030,29 +2030,32 @@ void Qmgr::execAPI_REGREQ(Signal* signal)
}//Qmgr::execAPI_REGREQ() }//Qmgr::execAPI_REGREQ()
void void
Qmgr::execAPI_VERSION_REQ(Signal * signal) { Qmgr::execAPI_VERSION_REQ(Signal * signal) {
jamEntry(); jamEntry();
ApiVersionReq * const req = (ApiVersionReq *)signal->getDataPtr(); ApiVersionReq * const req = (ApiVersionReq *)signal->getDataPtr();
Uint32 senderRef = req->senderRef; Uint32 senderRef = req->senderRef;
Uint32 nodeId = req->nodeId; Uint32 nodeId = req->nodeId;
ApiVersionConf * conf = (ApiVersionConf *)req; ApiVersionConf * conf = (ApiVersionConf *)req;
if(getNodeInfo(nodeId).m_connected) if(getNodeInfo(nodeId).m_connected)
{
conf->version = getNodeInfo(nodeId).m_version; conf->version = getNodeInfo(nodeId).m_version;
struct in_addr in= globalTransporterRegistry.get_connect_address(nodeId);
conf->inet_addr= in.s_addr;
}
else else
{
conf->version = 0; conf->version = 0;
conf->inet_addr= 0;
}
conf->nodeId = nodeId; conf->nodeId = nodeId;
struct in_addr in= globalTransporterRegistry.get_connect_address(nodeId);
conf->inet_addr= in.s_addr;
sendSignal(senderRef, sendSignal(senderRef,
GSN_API_VERSION_CONF, GSN_API_VERSION_CONF,
signal, signal,
ApiVersionConf::SignalLength, JBB); ApiVersionConf::SignalLength, JBB);
} }
......
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