From: Date: December 6 2005 11:25am
Subject: bk commit into 5.0 tree (stewart:1.1976) BUG#15512
List-Archive: http://lists.mysql.com/internals/33060
X-Bug: 15512
Message-Id: <20051206102559.22D971490FD4@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1976 05/12/06 11:25:53 stewart@stripped +1 -0
  BUG#15512 crash during online add of API/SQL node

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.23 05/12/06 11:25:49 stewart@stripped +10 -7
    Only get_connect_address for connected nodes.
    
    (also cleanup whitespace)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/bug15512

--- 1.22/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2005-10-11 15:47:57 +02:00
+++ 1.23/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2005-12-06 11:25:49 +01:00
@@ -2030,29 +2030,32 @@
 }//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);
-
-
 }