bug#8645 - ndb - ndb_mgmd nodeid handling

  (not to be merged as code has changed in 5.0)


ndb/src/mgmapi/LocalConfig.cpp:
  Allow connecstring = "nodeid=X"
ndb/src/mgmsrv/MgmtSrvr.cpp:
  remove incorrect asserts

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"