Commit da64ad06 authored by lzhou/zhl@dev3-63.(none)'s avatar lzhou/zhl@dev3-63.(none)

Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug23354

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug23354
parents 403c0b35 14e19b1e
...@@ -90,8 +90,6 @@ void getRestartAction(Uint32 action, BaseString &str) ...@@ -90,8 +90,6 @@ void getRestartAction(Uint32 action, BaseString &str)
if (action == 0) if (action == 0)
return; return;
str.appfmt(", restarting"); str.appfmt(", restarting");
if (action & 2)
str.appfmt(", no start");
if (action & 4) if (action & 4)
str.appfmt(", initial"); str.appfmt(", initial");
} }
......
...@@ -2086,7 +2086,7 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list, ...@@ -2086,7 +2086,7 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list,
return -1; return -1;
} }
if (!nostart) if (nostart)
ndbout_c("Shutting down nodes with \"-n, no start\" option, to subsequently start the nodes."); 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, result= ndb_mgm_restart3(m_mgmsrv, no_of_nodes, node_ids,
...@@ -2106,7 +2106,15 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list, ...@@ -2106,7 +2106,15 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list,
ndbout << "Node"; ndbout << "Node";
for (int i= 0; i < no_of_nodes; i++) for (int i= 0; i < no_of_nodes; i++)
ndbout << " " << node_ids[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) if(need_disconnect)
disconnect(); disconnect();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment