Commit 2cd08261 authored by unknown's avatar unknown
Browse files

Merge tulin@production.mysql.com:mysql-5.0 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
parents d1ccab41 a35a5cd3

ndb/src/mgmapi/mgmapi.cpp

+3 −0
Original line number Diff line number Diff line
@@ -695,10 +695,12 @@ ndb_mgm_get_status(NdbMgmHandle handle) 
  Vector<BaseString> split;

  tmp.split(split, ":");

  if(split.size() != 2){

    SET_ERROR(handle, NDB_MGM_ILLEGAL_NODE_STATUS, buf);

    return NULL;

  }

 

  if(!(split[0].trim() == "nodes")){

    SET_ERROR(handle, NDB_MGM_ILLEGAL_NODE_STATUS, buf);

    return NULL;

  }
@@ -746,6 +748,7 @@ ndb_mgm_get_status(NdbMgmHandle handle) 


  if(i+1 != noOfNodes){

    free(state);

    SET_ERROR(handle, NDB_MGM_ILLEGAL_NODE_STATUS, "Node count mismatch");

    return NULL;

  }

ndb/tools/waiter.cpp

+6 −0
Original line number Diff line number Diff line
@@ -124,6 +124,12 @@ getStatus(){ 
      ndbout << "status==NULL, retries="<<retries<<endl;

      MGMERR(handle);

      retries++;

      ndb_mgm_disconnect(handle);

      if (ndb_mgm_connect(handle,0,0,1)) {

        MGMERR(handle);

        g_err  << "Reconnect failed" << endl;

        break;

      }

      continue;

    }

    int count = status->no_of_nodes;