mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug23354
into dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug23354 storage/ndb/src/common/debugger/EventLogger.cpp: Auto merged storage/ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged
This commit is contained in:
commit
5357be7f3e
2 changed files with 10 additions and 4 deletions
|
@ -90,8 +90,6 @@ void getRestartAction(Uint32 action, BaseString &str)
|
|||
if (action == 0)
|
||||
return;
|
||||
str.appfmt(", restarting");
|
||||
if (action & 2)
|
||||
str.appfmt(", no start");
|
||||
if (action & 4)
|
||||
str.appfmt(", initial");
|
||||
}
|
||||
|
|
|
@ -2086,7 +2086,7 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list,
|
|||
return -1;
|
||||
}
|
||||
|
||||
if (!nostart)
|
||||
if (nostart)
|
||||
ndbout_c("Shutting down nodes with \"-n, no start\" option, to subsequently start the nodes.");
|
||||
|
||||
result= ndb_mgm_restart3(m_mgmsrv, no_of_nodes, node_ids,
|
||||
|
@ -2106,7 +2106,15 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list,
|
|||
ndbout << "Node";
|
||||
for (int i= 0; i < no_of_nodes; i++)
|
||||
ndbout << " " << node_ids[i];
|
||||
ndbout_c(" is being restarted");
|
||||
ndbout_c(": Is being restarted");
|
||||
|
||||
ndbout << "Node";
|
||||
for (int i= 0; i < no_of_nodes; i++)
|
||||
ndbout << " " << node_ids[i];
|
||||
if (nostart)
|
||||
ndbout_c(": No start");
|
||||
else
|
||||
ndbout_c(": Is rejoining the cluster");
|
||||
}
|
||||
if(need_disconnect)
|
||||
disconnect();
|
||||
|
|
Loading…
Reference in a new issue