mirror of
https://github.com/MariaDB/server.git
synced 2025-10-21 08:47:42 +03:00
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
This commit is contained in:
@@ -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) {
|
||||
|
Reference in New Issue
Block a user