Commit 875cdfe3 authored by unknown's avatar unknown

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

into mysql.com:/home/stewart/Documents/MySQL/4.1/ndb-pristine


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
parents c23f6444 d5c7d850
...@@ -2294,8 +2294,9 @@ MgmtSrvr::alloc_node_id(NodeId * nodeId, ...@@ -2294,8 +2294,9 @@ MgmtSrvr::alloc_node_id(NodeId * nodeId,
if (found_matching_type) if (found_matching_type)
if (found_free_node) if (found_free_node)
error_string.appfmt("Connection done from wrong host ip %s.", error_string.appfmt("Connection done from wrong host ip %s.",
(client_addr)?
inet_ntoa(((struct sockaddr_in *) inet_ntoa(((struct sockaddr_in *)
(client_addr))->sin_addr)); (client_addr))->sin_addr):"");
else else
error_string.appfmt("No free node id found for %s.", error_string.appfmt("No free node id found for %s.",
type_string.c_str()); type_string.c_str());
......
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