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

into mysql.com:/home/stewart/Documents/MySQL/4.1/ndb-pristine
This commit is contained in:
stewart@mysql.com 2004-12-08 11:11:20 +11:00
commit 3519e554e7

View file

@ -2294,8 +2294,9 @@ MgmtSrvr::alloc_node_id(NodeId * nodeId,
if (found_matching_type)
if (found_free_node)
error_string.appfmt("Connection done from wrong host ip %s.",
inet_ntoa(((struct sockaddr_in *)
(client_addr))->sin_addr));
(client_addr)?
inet_ntoa(((struct sockaddr_in *)
(client_addr))->sin_addr):"");
else
error_string.appfmt("No free node id found for %s.",
type_string.c_str());