Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged

ndb/src/common/transporter/TransporterRegistry.cpp

@@ -1483,44 +1483,56 @@ TransporterRegistry::get_transporter(NodeId nodeId) {
 
 NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(SocketClient *sc)
 {
-  NdbMgmHandle h;
+  NdbMgmHandle h= ndb_mgm_create_handle();
   struct ndb_mgm_reply mgm_reply;
-  char *cs, c[100];
-  bool d=false;
 
-  h= ndb_mgm_create_handle();
-
-  if(strlen(sc->get_server_name())>80)
+  if ( h == NULL )
   {
-    /*
-     * server name is long. malloc enough for it and the port number
-     */
-    cs= (char*)malloc((strlen(sc->get_server_name())+20)*sizeof(char));
-    if(!cs)
-      return NDB_INVALID_SOCKET;
-    d= true;
+    return NDB_INVALID_SOCKET;
   }
-  else
-    cs = &c[0];
-    
-  snprintf(cs,(d)?strlen(sc->get_server_name()+20):sizeof(c),
-	   "%s:%u",sc->get_server_name(),sc->get_port());
 
-  ndb_mgm_set_connectstring(h, cs);
+  /**
+   * Set connectstring
+   */
+  {
+    char c[100];
+    char *cs= &c[0];
+    int len= strlen(sc->get_server_name())+20;
+    if( len > sizeof(c) )
+    {
+      /*
+       * server name is long. malloc enough for it and the port number
+       */
+      cs= (char*)malloc(len*sizeof(char));
+      if(!cs)
+      {
+	ndb_mgm_destroy_handle(&h);
+	return NDB_INVALID_SOCKET;
+      }
+    }
+    snprintf(cs,len,"%s:%u",sc->get_server_name(),sc->get_port());
+    ndb_mgm_set_connectstring(h, cs);
+    if(cs != &c[0])
+      free(cs);
+  }
 
   if(ndb_mgm_connect(h, 0, 0, 0)<0)
+  {
+    ndb_mgm_destroy_handle(&h);
     return NDB_INVALID_SOCKET;
-  
+  }
+
   for(unsigned int i=0;i < m_transporter_interface.size();i++)
-    ndb_mgm_set_connection_int_parameter(h,
+    if (ndb_mgm_set_connection_int_parameter(h,
 				   get_localNodeId(),
 				   m_transporter_interface[i].m_remote_nodeId,
 				   CFG_CONNECTION_SERVER_PORT,
 				   m_transporter_interface[i].m_s_service_port,
-				   &mgm_reply);  
-  if(d)
-    free(cs);
-
+				   &mgm_reply) < 0)
+    {
+      ndb_mgm_destroy_handle(&h);
+      return NDB_INVALID_SOCKET;
+    }
   return ndb_mgm_convert_to_transporter(h);
 }