diff options
| author | unknown <joreland@mysql.com> | 2005-02-24 06:19:41 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-24 06:19:41 +0100 |
| commit | 885e13aba29171ebfbeb3c548781b270b76520ed (patch) | |
| tree | ff343844dd24b925066b43bbd28dc28e24c7d4fb /ndb | |
| parent | a23c1bf64ee8a8f7d27266f0abc5e43c45437bb9 (diff) | |
| parent | f4cef73bd76a2ce138b32e405d5d898f824ec76d (diff) | |
| download | mariadb-git-885e13aba29171ebfbeb3c548781b270b76520ed.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/mgmapi/LocalConfig.cpp | 8 | ||||
| -rw-r--r-- | ndb/src/mgmsrv/MgmtSrvr.cpp | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ndb/src/mgmapi/LocalConfig.cpp b/ndb/src/mgmapi/LocalConfig.cpp index 1dc805557ee..0265f982df3 100644 --- a/ndb/src/mgmapi/LocalConfig.cpp +++ b/ndb/src/mgmapi/LocalConfig.cpp @@ -226,7 +226,13 @@ LocalConfig::parseString(const char * connectString, BaseString &err){ return false; } - if (!found_other) { + if (b_nodeId && !found_other) + { + BaseString tmp; + tmp.assfmt("host=localhost:%s", NDB_PORT); + if(parseHostName(tmp.c_str())) + return true; + err.appfmt("Missing host/file name extry in \"%s\"", connectString); return false; } diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp index e36461c8d0d..5eb7fe33e48 100644 --- a/ndb/src/mgmsrv/MgmtSrvr.cpp +++ b/ndb/src/mgmsrv/MgmtSrvr.cpp @@ -2230,9 +2230,6 @@ MgmtSrvr::alloc_node_id(NodeId * nodeId, id_found= tmp; break; } - assert(no_mgm > 1); - assert(*nodeId != 0); - assert(type != NDB_MGM_NODE_TYPE_MGM); if (id_found) { // mgmt server may only have one match error_string.appfmt("Ambiguous node id's %d and %d.\n" "Suggest specifying node id in connectstring,\n" |