diff options
| author | unknown <stewart@mysql.com> | 2004-12-08 11:11:20 +1100 |
|---|---|---|
| committer | unknown <stewart@mysql.com> | 2004-12-08 11:11:20 +1100 |
| commit | 875cdfe3c965c1d38e30c04a9d42112936be76fb (patch) | |
| tree | 41668667f4a8858da3556ac881dec0d265d666b5 /ndb | |
| parent | c23f6444203afadeb212225d2a8b208b459401de (diff) | |
| parent | d5c7d8500107271571f13baa54b246827e134143 (diff) | |
| download | mariadb-git-875cdfe3c965c1d38e30c04a9d42112936be76fb.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
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/mgmsrv/MgmtSrvr.cpp | 5 |
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()); |