mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj

Browse source 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug23354


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
This commit is contained in:
unknown 2007-07-30 10:45:46 +00:00
commit 2b8cf60a85
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ndb/src/common/debugger/EventLogger.cpp
View file

@ -91,8 +91,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");
}

12
ndb/src/mgmclient/CommandInterpreter.cpp
View file

@ -2148,7 +2148,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,
@ -2168,7 +2168,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();