Commit 885e13ab authored by unknown's avatar unknown
Browse files

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
parents a23c1bf6 f4cef73b

ndb/src/mgmapi/LocalConfig.cpp

+7 −1
Original line number Diff line number Diff line
@@ -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;

  }

ndb/src/mgmsrv/MgmtSrvr.cpp

+0 −3
Original line number Diff line number Diff line
@@ -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"