database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-24 07:13:33 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
unknown
2006-08-16 15:33:54 +08:00
parent be495c39aa 105ed9dec3
commit e2da07cd57
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
storage/ndb/src/mgmapi/mgmapi.cpp
View File

@@ -1430,6 +1430,7 @@ ndb_mgm_listen_event_internal(NdbMgmHandle handle, const int filter[],
close(sockfd); close(sockfd);
CHECK_REPLY(reply, -1); CHECK_REPLY(reply, -1);
} }
delete reply;
return sockfd; return sockfd;
} }

2
storage/ndb/src/mgmclient/CommandInterpreter.cpp
View File

@@ -1173,6 +1173,7 @@ CommandInterpreter::executeShow(char* parameters)
if(it == 0){ if(it == 0){
ndbout_c("Unable to create config iterator"); ndbout_c("Unable to create config iterator");
ndb_mgm_destroy_configuration(conf);
return; return;
} }
NdbAutoPtr<ndb_mgm_configuration_iterator> ptr(it); 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, "ndb_mgmd", mgm_nodes, NDB_MGM_NODE_TYPE_MGM, 0);
print_nodes(state, it, "mysqld", api_nodes, NDB_MGM_NODE_TYPE_API, 0); print_nodes(state, it, "mysqld", api_nodes, NDB_MGM_NODE_TYPE_API, 0);
// ndbout << helpTextShow; // ndbout << helpTextShow;
ndb_mgm_destroy_configuration(conf);
return; return;
} else if (strcasecmp(parameters, "PROPERTIES") == 0 || } else if (strcasecmp(parameters, "PROPERTIES") == 0 ||
strcasecmp(parameters, "PROP") == 0) { strcasecmp(parameters, "PROP") == 0) {