removed different CFG_ defined for connection host names

added support for setting up multiple interfaces
correct connect address for mgmt server
bug, -l flag would be interpreted as connectstring
added flag to remove all node id checks
changed automatic allocation of ports somewhat


ndb/include/mgmapi/mgmapi_config_parameters.h:
  removed different CFG_ defined for connection host names
ndb/include/transporter/TransporterRegistry.hpp:
  added support for setting up multiple interfaces
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  removed different CFG_ defined for connection host names
ndb/src/common/mgmcommon/IPCConfig.cpp:
  added support for setting up multiple interfaces
ndb/src/common/portlib/NdbTCP.cpp:
  added debug printouts
ndb/src/common/transporter/TransporterRegistry.cpp:
  added support for setting up multiple interfaces
ndb/src/common/util/SocketServer.cpp:
  added my_thread init to enable debug printouts
ndb/src/mgmclient/CommandInterpreter.cpp:
  shortened lines
ndb/src/mgmsrv/ConfigInfo.cpp:
  removed different CFG_ defined for connection host names
  changed automatic allocation of ports somewhat
ndb/src/mgmsrv/MgmtSrvr.cpp:
  correct connect address for mgmt server
ndb/src/mgmsrv/Services.cpp:
  shoretened lines
ndb/src/mgmsrv/main.cpp:
  bug, -l flag would be interpreted as connectstring
  added flag to remove all node id checks

1 files changed, 12 insertions, 5 deletions

diff --git a/ndb/src/mgmclient/CommandInterpreter.cpp b/ndb/src/mgmclient/CommandInterpreter.cpp
index 91d057f8c30..ba8e93edde9 100644
--- a/ndb/src/mgmclient/CommandInterpreter.cpp
+++ b/ndb/src/mgmclient/CommandInterpreter.cpp
@@ -673,8 +673,10 @@ CommandInterpreter::executeShutdown(char* parameters)
       if (mgm_id == 0)
 	mgm_id= state->node_states[i].node_id;
       else {
-	ndbout << "Unable to locate management server, shutdown manually with #STOP"
+	ndbout << "Unable to locate management server, "
+	       << "shutdown manually with <id> STOP"
 	       << endl;
+	return;
       }
     }
   }
@@ -721,11 +723,13 @@ const char *status_string(ndb_mgm_node_status status)
 
 static void
 print_nodes(ndb_mgm_cluster_state *state, ndb_mgm_configuration_iterator *it,
-	    const char *proc_name, int no_proc, ndb_mgm_node_type type, int master_id)
+	    const char *proc_name, int no_proc, ndb_mgm_node_type type,
+	    int master_id)
 { 
   int i;
   ndbout << "[" << proc_name
-	 << "(" << ndb_mgm_get_node_type_string(type) << ")]\t" << no_proc << " node(s)" << endl;
+	 << "(" << ndb_mgm_get_node_type_string(type) << ")]\t"
+	 << no_proc << " node(s)" << endl;
   for(i=0; i < state->no_of_nodes; i++) {
     struct ndb_mgm_node_state *node_state= &(state->node_states[i]);
     if(node_state->node_type == type) {
@@ -733,7 +737,9 @@ print_nodes(ndb_mgm_cluster_state *state, ndb_mgm_configuration_iterator *it,
       ndbout << "id=" << node_id;
       if(node_state->version != 0) {
 	const char *hostname= node_state->connect_address;
-	if (hostname == 0 || strlen(hostname) == 0 || strcmp(hostname,"0.0.0.0") == 0)
+	if (hostname == 0
+	    || strlen(hostname) == 0
+	    || strcmp(hostname,"0.0.0.0") == 0)
 	  ndbout << " ";
 	else
 	  ndbout << "\t@" << hostname;
@@ -761,7 +767,8 @@ print_nodes(ndb_mgm_cluster_state *state, ndb_mgm_configuration_iterator *it,
 	ndb_mgm_get_string_parameter(it, CFG_NODE_HOST, &config_hostname);
 	if (config_hostname == 0 || config_hostname[0] == 0)
 	  config_hostname= "any host";
-	ndbout << " (not connected, accepting connect from " << config_hostname << ")" << endl;
+	ndbout << " (not connected, accepting connect from "
+	       << config_hostname << ")" << endl;
       }
     }
   }