Commit e3a39c9e authored by stewart@mysql.com's avatar stewart@mysql.com

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

into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
parents 9baff808 dc5d31cb
...@@ -1483,44 +1483,56 @@ TransporterRegistry::get_transporter(NodeId nodeId) { ...@@ -1483,44 +1483,56 @@ TransporterRegistry::get_transporter(NodeId nodeId) {
NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(SocketClient *sc) NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(SocketClient *sc)
{ {
NdbMgmHandle h; NdbMgmHandle h= ndb_mgm_create_handle();
struct ndb_mgm_reply mgm_reply; struct ndb_mgm_reply mgm_reply;
char *cs, c[100];
bool d=false;
h= ndb_mgm_create_handle(); if ( h == NULL )
if(strlen(sc->get_server_name())>80)
{ {
/* return NDB_INVALID_SOCKET;
* 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;
} }
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) if(ndb_mgm_connect(h, 0, 0, 0)<0)
{
ndb_mgm_destroy_handle(&h);
return NDB_INVALID_SOCKET; return NDB_INVALID_SOCKET;
}
for(unsigned int i=0;i < m_transporter_interface.size();i++) 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(), get_localNodeId(),
m_transporter_interface[i].m_remote_nodeId, m_transporter_interface[i].m_remote_nodeId,
CFG_CONNECTION_SERVER_PORT, CFG_CONNECTION_SERVER_PORT,
m_transporter_interface[i].m_s_service_port, m_transporter_interface[i].m_s_service_port,
&mgm_reply); &mgm_reply) < 0)
if(d) {
free(cs); ndb_mgm_destroy_handle(&h);
return NDB_INVALID_SOCKET;
}
return ndb_mgm_convert_to_transporter(h); return ndb_mgm_convert_to_transporter(h);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment