Commit e2da07cd authored by unknown's avatar unknown
Browse files

Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb 

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb


storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
parents be495c39 105ed9de

storage/ndb/src/mgmapi/mgmapi.cpp

+6 −5
Original line number Diff line number Diff line
@@ -1430,6 +1430,7 @@ ndb_mgm_listen_event_internal(NdbMgmHandle handle, const int filter[], 
    close(sockfd);

    CHECK_REPLY(reply, -1);

  }

  delete reply;

  return sockfd;

}

storage/ndb/src/mgmclient/CommandInterpreter.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1173,6 +1173,7 @@ CommandInterpreter::executeShow(char* parameters) 


    if(it == 0){

      ndbout_c("Unable to create config iterator");

      ndb_mgm_destroy_configuration(conf);

      return;

    }

    NdbAutoPtr<ndb_mgm_configuration_iterator> ptr(it);
@@ -1217,6 +1218,7 @@ CommandInterpreter::executeShow(char* parameters) 
    print_nodes(state, it, "ndb_mgmd", mgm_nodes, NDB_MGM_NODE_TYPE_MGM, 0);

    print_nodes(state, it, "mysqld",   api_nodes, NDB_MGM_NODE_TYPE_API, 0);

    //    ndbout << helpTextShow;

    ndb_mgm_destroy_configuration(conf);

    return;

  } else if (strcasecmp(parameters, "PROPERTIES") == 0 ||

	     strcasecmp(parameters, "PROP") == 0) {