1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug15512
This commit is contained in:
stewart@mysql.com 2005-12-06 11:45:51 +01:00
commit df48873089
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
View File

@ -2040,19 +2040,22 @@ Qmgr::execAPI_VERSION_REQ(Signal * signal) {
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;
else
conf->version = 0;
conf->nodeId = nodeId;
struct in_addr in= globalTransporterRegistry.get_connect_address(nodeId); struct in_addr in= globalTransporterRegistry.get_connect_address(nodeId);
conf->inet_addr= in.s_addr; conf->inet_addr= in.s_addr;
}
else
{
conf->version = 0;
conf->inet_addr= 0;
}
conf->nodeId = nodeId;
sendSignal(senderRef, sendSignal(senderRef,
GSN_API_VERSION_CONF, GSN_API_VERSION_CONF,
signal, signal,
ApiVersionConf::SignalLength, JBB); ApiVersionConf::SignalLength, JBB);
} }