MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:tomas Date:January 18 2006 9:19am
Subject:bk commit into 5.1 tree (tomas:1.1963) BUG#15512
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.1963 06/01/18 10:18:56 tomas@stripped +1 -0
  Bug #15512

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.23 06/01/18 10:18:47 tomas@stripped +10 -8
    Bug #15512

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/wl2325-alcatel

--- 1.22/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2005-10-14 11:55:29 +02:00
+++ 1.23/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2006-01-18 10:18:47 +01:00
@@ -2043,19 +2043,21 @@
 
   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, 
-	     GSN_API_VERSION_CONF,
-	     signal,
-	     ApiVersionConf::SignalLength, JBB);
-
-
+             GSN_API_VERSION_CONF,
+             signal,
+             ApiVersionConf::SignalLength, JBB);
 }
 
 
Thread
bk commit into 5.1 tree (tomas:1.1963) BUG#15512tomas18 Jan