diff options
| author | joreland@mysql.com <> | 2005-02-24 06:14:43 +0100 |
|---|---|---|
| committer | joreland@mysql.com <> | 2005-02-24 06:14:43 +0100 |
| commit | 87402eb5bbb563e4b84c9de3a6cca58822c97ad0 (patch) | |
| tree | d7f80650603a39c6744f2f22f23900956c76962a /ndb/src | |
| parent | 30ade5b57e65224af0745f9cd1ca1f5474434f35 (diff) | |
| parent | c0f4bc13932ff62815bec6b9998bbe302b91e487 (diff) | |
| download | mariadb-git-87402eb5bbb563e4b84c9de3a6cca58822c97ad0.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
Diffstat (limited to 'ndb/src')
| -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 66c9a6448aa..3bc00b18f50 100644 --- a/ndb/src/mgmsrv/MgmtSrvr.cpp +++ b/ndb/src/mgmsrv/MgmtSrvr.cpp @@ -2229,9 +2229,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" |