bk commit into 5.0 tree (tomas:1.1940) BUG#11221

[tomas]

Below is the list of changes that have just been committed into a local
5.0 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.1940 05/06/15 12:29:55 tomas@stripped +3 -0
  Bug #11221  	Mysqld does not automatically reconnecting to cluster with cluster restart

  ndb/src/common/transporter/TransporterRegistry.cpp
    1.54 05/06/15 12:29:50 tomas@stripped +15 -3
    Bug #11221  	Mysqld does not automatically reconnecting to cluster with cluster
restart

  ndb/src/common/mgmcommon/IPCConfig.cpp
    1.20 05/06/15 12:29:50 tomas@stripped +2 -4
    Bug #11221  	Mysqld does not automatically reconnecting to cluster with cluster
restart

  ndb/include/transporter/TransporterDefinitions.hpp
    1.11 05/06/15 12:29:50 tomas@stripped +1 -1
    Bug #11221  	Mysqld does not automatically reconnecting to cluster with cluster
restart

# 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/mysql-5.0

--- 1.10/ndb/include/transporter/TransporterDefinitions.hpp	2005-05-19 20:38:45 +02:00
+++ 1.11/ndb/include/transporter/TransporterDefinitions.hpp	2005-06-15 12:29:50 +02:00
@@ -56,7 +56,7 @@
  * information specific to a transporter type.
  */
 struct TransporterConfiguration {
-  Uint32 port;
+  Int32 s_port; // negative port number implies dynamic port
   const char *remoteHostName;
   const char *localHostName;
   NodeId remoteNodeId;

--- 1.19/ndb/src/common/mgmcommon/IPCConfig.cpp	2005-06-08 09:35:03 +02:00
+++ 1.20/ndb/src/common/mgmcommon/IPCConfig.cpp	2005-06-15 12:29:50 +02:00
@@ -271,14 +271,12 @@
 
       If we're not using dynamic ports, we don't do anything.
     */
-    if((int)server_port<0)
-      server_port= -server_port;
 
     conf.localNodeId    = nodeId;
     conf.remoteNodeId   = remoteNodeId;
     conf.checksum       = checksum;
     conf.signalId       = sendSignalId;
-    conf.port           = server_port;
+    conf.s_port         = server_port;
     conf.localHostName  = localHostName;
     conf.remoteHostName = remoteHostName;
 
@@ -350,7 +348,7 @@
       if (!iter.get(CFG_TCP_PROXY, &proxy)) {
 	if (strlen(proxy) > 0 && nodeId2 == nodeId) {
 	  // TODO handle host:port
-	  conf.port = atoi(proxy);
+	  conf.s_port = atoi(proxy);
 	}
       }
       

--- 1.53/ndb/src/common/transporter/TransporterRegistry.cpp	2005-05-26 22:07:29 +02:00
+++ 1.54/ndb/src/common/transporter/TransporterRegistry.cpp	2005-06-15 12:29:50 +02:00
@@ -290,7 +290,7 @@
 					    config->tcp.maxReceiveSize,
 					    config->localHostName,
 					    config->remoteHostName,
-					    config->port,
+					    config->s_port,
 					    config->isMgmConnection,
 					    localNodeId,
 					    config->remoteNodeId,
@@ -392,7 +392,7 @@
   SCI_Transporter * t = new SCI_Transporter(*this,
                                             config->localHostName,
                                             config->remoteHostName,
-                                            config->port,
+                                            config->s_port,
 					    config->isMgmConnection,
                                             config->sci.sendLimit, 
 					    config->sci.bufferSize,
@@ -458,7 +458,7 @@
   SHM_Transporter * t = new SHM_Transporter(*this,
 					    config->localHostName,
 					    config->remoteHostName,
-					    config->port,
+					    config->s_port,
 					    config->isMgmConnection,
 					    localNodeId,
 					    config->remoteNodeId,
@@ -1170,7 +1170,10 @@
   case DISCONNECTING:
     break;
   }
+  DBUG_ENTER("TransporterRegistry::do_connect");
+  DBUG_PRINT("info",("performStates[%d]=CONNECTING",node_id));
   curr_state= CONNECTING;
+  DBUG_VOID_RETURN;
 }
 void
 TransporterRegistry::do_disconnect(NodeId node_id)
@@ -1186,21 +1189,30 @@
   case DISCONNECTING:
     return;
   }
+  DBUG_ENTER("TransporterRegistry::do_disconnect");
+  DBUG_PRINT("info",("performStates[%d]=DISCONNECTING",node_id));
   curr_state= DISCONNECTING;
+  DBUG_VOID_RETURN;
 }
 
 void
 TransporterRegistry::report_connect(NodeId node_id)
 {
+  DBUG_ENTER("TransporterRegistry::report_connect");
+  DBUG_PRINT("info",("performStates[%d]=CONNECTED",node_id));
   performStates[node_id] = CONNECTED;
   reportConnect(callbackObj, node_id);
+  DBUG_VOID_RETURN;
 }
 
 void
 TransporterRegistry::report_disconnect(NodeId node_id, int errnum)
 {
+  DBUG_ENTER("TransporterRegistry::report_connect");
+  DBUG_PRINT("info",("performStates[%d]=DISCONNECTED",node_id));
   performStates[node_id] = DISCONNECTED;
   reportDisconnect(callbackObj, node_id, errnum);
+  DBUG_VOID_RETURN;
 }
 
 void