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

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

into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports
parents 9ca2c7c6 59b15888
...@@ -123,11 +123,8 @@ SocketServer::setup(SocketServer::Service * service, ...@@ -123,11 +123,8 @@ SocketServer::setup(SocketServer::Service * service,
/* Get the port we bound to */ /* Get the port we bound to */
SOCKET_SIZE_TYPE sock_len = sizeof(servaddr); SOCKET_SIZE_TYPE sock_len = sizeof(servaddr);
if(getsockname(sock,(struct sockaddr*)&servaddr,&sock_len)<0) { if(getsockname(sock,(struct sockaddr*)&servaddr,&sock_len)<0) {
char msg[100];
if(!strerror_r(errno,msg,sizeof(msg)))
strcpy(msg,"Unknown");
ndbout_c("An error occurred while trying to find out what" ndbout_c("An error occurred while trying to find out what"
" port we bound to. Error: %s",msg); " port we bound to. Error: %s",strerror(errno));
NDB_CLOSE_SOCKET(sock); NDB_CLOSE_SOCKET(sock);
DBUG_RETURN(false); DBUG_RETURN(false);
} }
......
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