Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3

into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl4


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged

ndb/include/mgmapi/mgmapi_debug.h

@@ -146,7 +146,7 @@ extern "C" {
 					   int node1,
 					   int node2,
 					   int param,
-					   unsigned value,
+					   int value,
 					   struct ndb_mgm_reply* reply);
 
   /**
@@ -165,7 +165,7 @@ extern "C" {
 					   int node1,
 					   int node2,
 					   int param,
-					   Uint32 *value,
+					   int *value,
 					   struct ndb_mgm_reply* reply);
 
 #ifdef __cplusplus

ndb/include/transporter/TransporterRegistry.hpp

@@ -232,12 +232,12 @@ public:
   class Transporter_interface {
   public:
     NodeId m_remote_nodeId;
-    unsigned short m_service_port;
+    int m_service_port;
     const char *m_interface;
   };
   Vector<Transporter_interface> m_transporter_interface;
   void add_transporter_interface(NodeId remoteNodeId, const char *interf,
-		  		 unsigned short port);
+		  		 int port);
   Transporter* get_transporter(NodeId nodeId);
   NodeId get_localNodeId() { return localNodeId; };
 

ndb/src/common/mgmcommon/IPCConfig.cpp

@@ -371,6 +371,9 @@ IPCConfig::configureTransporters(Uint32 nodeId,
     }
     DBUG_PRINT("info", ("Transporter between this node %d and node %d using port %d, signalId %d, checksum %d",
                nodeId, remoteNodeId, server_port, sendSignalId, checksum));
+    if((int)server_port<0)
+      server_port= -server_port;		// A dynamic port
+
     switch(type){
     case CONNECTION_TYPE_SHM:{
       SHM_TransporterConfiguration conf;

ndb/src/common/transporter/TransporterRegistry.cpp

@@ -1189,7 +1189,7 @@ TransporterRegistry::start_clients_thread()
       case CONNECTING:
 	if(!t->isConnected() && !t->isServer) {
 	  if(t->get_r_port() <= 0) {		// Port is dynamic
-	    Uint32 server_port= 0;
+	    int server_port= 0;
 	    struct ndb_mgm_reply mgm_reply;
 	    int res;
 
@@ -1199,9 +1199,13 @@ TransporterRegistry::start_clients_thread()
 						     CFG_CONNECTION_SERVER_PORT,
 						     &server_port,
 						     &mgm_reply);
-	    DBUG_PRINT("info",("Got dynamic port %u for %d -> %d (ret: %d)",
+	    DBUG_PRINT("info",("Got %s port %u for %d -> %d (ret: %d)",
+			       (server_port<=0)?"dynamic":"static",
 			       server_port,t->getRemoteNodeId(),
 			       t->getLocalNodeId(),res));
+	    if(server_port<0)
+	      server_port = -server_port; // was a dynamic port
+
 	    if(res>=0)
 	      t->set_r_port(server_port);
 	    else
@@ -1263,7 +1267,7 @@ TransporterRegistry::stop_clients()
 void
 TransporterRegistry::add_transporter_interface(NodeId remoteNodeId,
 					       const char *interf, 
-					       unsigned short port)
+					       int port)
 {
   DBUG_ENTER("TransporterRegistry::add_transporter_interface");
   DBUG_PRINT("enter",("interface=%s, port= %d", interf, port));
@@ -1307,18 +1311,34 @@ TransporterRegistry::start_service(SocketServer& socket_server)
   {
     Transporter_interface &t= m_transporter_interface[i];
 
+    unsigned short port= t.m_service_port;
+    if(t.m_service_port<0)
+      port= -t.m_service_port; // is a dynamic port
     TransporterService *transporter_service =
       new TransporterService(new SocketAuthSimple("ndbd", "ndbd passwd"));
     if(!socket_server.setup(transporter_service,
-			    &t.m_service_port, t.m_interface))
+			    &port, t.m_interface))
     {
-      ndbout_c("Unable to setup transporter service port: %s:%d!\n"
-	       "Please check if the port is already used,\n"
-	       "(perhaps the node is already running)",
-	       t.m_interface ? t.m_interface : "*", t.m_service_port);
-      delete transporter_service;
-      return false;
+      DBUG_PRINT("info", ("Trying new port"));
+      port= 0;
+      if(t.m_service_port>0
+	 || !socket_server.setup(transporter_service,
+				 &port, t.m_interface))
+      {
+	/*
+	 * If it wasn't a dynamically allocated port, or
+	 * our attempts at getting a new dynamic port failed
+	 */
+	ndbout_c("Unable to setup transporter service port: %s:%d!\n"
+		 "Please check if the port is already used,\n"
+		 "(perhaps the node is already running)",
+		 t.m_interface ? t.m_interface : "*", t.m_service_port);
+	delete transporter_service;
+	return false;
+      }
     }
+    t.m_service_port= (t.m_service_port<=0)?-port:port; // -`ve if dynamic
+    DBUG_PRINT("info", ("t.m_service_port = %d",t.m_service_port));
     transporter_service->setTransporterRegistry(this);
   }
   return true;

ndb/src/mgmapi/mgmapi.cpp

@@ -2054,7 +2054,7 @@ ndb_mgm_set_connection_int_parameter(NdbMgmHandle handle,
 				     int node1,
 				     int node2,
 				     int param,
-				     unsigned value,
+				     int value,
 				     struct ndb_mgm_reply* mgmreply){
   DBUG_ENTER("ndb_mgm_set_connection_int_parameter");
   CHECK_HANDLE(handle, 0);
@@ -2064,7 +2064,7 @@ ndb_mgm_set_connection_int_parameter(NdbMgmHandle handle,
   args.put("node1", node1);
   args.put("node2", node2);
   args.put("param", param);
-  args.put("value", value);
+  args.put("value", (Uint32)value);
   
   const ParserRow<ParserDummy> reply[]= {
     MGM_CMD("set connection parameter reply", NULL, ""),
@@ -2097,7 +2097,7 @@ ndb_mgm_get_connection_int_parameter(NdbMgmHandle handle,
 				     int node1,
 				     int node2,
 				     int param,
-				     Uint32 *value,
+				     int *value,
 				     struct ndb_mgm_reply* mgmreply){
   DBUG_ENTER("ndb_mgm_get_connection_int_parameter");
   CHECK_HANDLE(handle, -1);
@@ -2129,7 +2129,7 @@ ndb_mgm_get_connection_int_parameter(NdbMgmHandle handle,
     res= 0;
   } while(0);
 
-  if(!prop->get("value",value)){
+  if(!prop->get("value",(Uint32*)value)){
     ndbout_c("Unable to get value");
     res = -4;
   }

ndb/src/mgmsrv/MgmtSrvr.cpp

@@ -2849,7 +2849,7 @@ int
 MgmtSrvr::getConnectionDbParameter(int node1, 
 				   int node2,
 				   int param,
-				   unsigned *value,
+				   int *value,
 				   BaseString& msg){
   DBUG_ENTER("MgmtSrvr::getConnectionDbParameter");
 
@@ -2874,12 +2874,12 @@ MgmtSrvr::getConnectionDbParameter(int node1,
     return -1;
   }
   
-  if(iter.get(param, value) < 0) {
+  if(iter.get(param, (Uint32*)value) < 0) {
     msg.assign("Unable to get current value of parameter");
     return -1;
   }
 
-  msg.assfmt("%u",*value);
+  msg.assfmt("%d",*value);
   DBUG_RETURN(1);
 }
 

ndb/src/mgmsrv/MgmtSrvr.hpp

@@ -510,7 +510,7 @@ public:
   int setConnectionDbParameter(int node1, int node2, int param, int value,
 			       BaseString& msg);
   int getConnectionDbParameter(int node1, int node2, int param,
-			       unsigned *value, BaseString& msg);
+			       int *value, BaseString& msg);
 
   int set_connect_string(const char *str);
 

ndb/src/mgmsrv/Services.cpp

@@ -1373,7 +1373,7 @@ void
 MgmApiSession::getConnectionParameter(Parser_t::Context &ctx,
 				      Properties const &args) {
   BaseString node1, node2, param;
-  unsigned value = 0;
+  int value = 0;
 
   args.get("node1", node1);
   args.get("node2", node2);
@@ -1387,7 +1387,7 @@ MgmApiSession::getConnectionParameter(Parser_t::Context &ctx,
 					      result);
   
   m_output->println("get connection parameter reply");
-  m_output->println("value: %u", value);
+  m_output->println("value: %d", value);
   m_output->println("result: %s", (ret>0)?"Ok":result.c_str());
   m_output->println("");
 }