mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 03:51:50 +01:00
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into mysql.com:/home/stewart/Documents/MySQL/5.0/bug15512
This commit is contained in:
commit
b04f21b571
1 changed files with 10 additions and 7 deletions
|
@ -2030,29 +2030,32 @@ void Qmgr::execAPI_REGREQ(Signal* signal)
|
|||
}//Qmgr::execAPI_REGREQ()
|
||||
|
||||
|
||||
void
|
||||
void
|
||||
Qmgr::execAPI_VERSION_REQ(Signal * signal) {
|
||||
jamEntry();
|
||||
ApiVersionReq * const req = (ApiVersionReq *)signal->getDataPtr();
|
||||
|
||||
|
||||
Uint32 senderRef = req->senderRef;
|
||||
Uint32 nodeId = req->nodeId;
|
||||
|
||||
ApiVersionConf * conf = (ApiVersionConf *)req;
|
||||
if(getNodeInfo(nodeId).m_connected)
|
||||
{
|
||||
conf->version = getNodeInfo(nodeId).m_version;
|
||||
struct in_addr in= globalTransporterRegistry.get_connect_address(nodeId);
|
||||
conf->inet_addr= in.s_addr;
|
||||
}
|
||||
else
|
||||
{
|
||||
conf->version = 0;
|
||||
conf->inet_addr= 0;
|
||||
}
|
||||
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,
|
||||
signal,
|
||||
ApiVersionConf::SignalLength, JBB);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue