summaryrefslogtreecommitdiff
path: root/ndb/src/mgmsrv
diff options
context:
space:
mode:
authorstewart@mysql.com <>2004-12-08 11:11:20 +1100
committerstewart@mysql.com <>2004-12-08 11:11:20 +1100
commit3519e554e71b82b5556f187d339e2281b2f0eb39 (patch)
tree41668667f4a8858da3556ac881dec0d265d666b5 /ndb/src/mgmsrv
parentb40fc582459376927a959d35bcca15bd01aa49cb (diff)
parentea0949a78a68bbc717f468375f06871397167cf6 (diff)
downloadmariadb-git-3519e554e71b82b5556f187d339e2281b2f0eb39.tar.gz
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/stewart/Documents/MySQL/4.1/ndb-pristine
Diffstat (limited to 'ndb/src/mgmsrv')
-rw-r--r--ndb/src/mgmsrv/MgmtSrvr.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp
index 4a9bfac3b6c..e1ab3633679 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.cpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.cpp
@@ -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());