diff options
| author | unknown <lzhou/zhl@dev3-63.(none)> | 2007-07-30 10:45:46 +0000 |
|---|---|---|
| committer | unknown <lzhou/zhl@dev3-63.(none)> | 2007-07-30 10:45:46 +0000 |
| commit | 2b8cf60a853820e9aa2846eddda40f29424b5f50 (patch) | |
| tree | b154276816bcf78a6f03778dd944ba3e6d3fb9f7 /ndb | |
| parent | 2d1d0efc4100c4606ac42f9dcf2966e441e9a669 (diff) | |
| parent | 71113c68c34a9144feb1ebb88889a86ae6b85400 (diff) | |
| download | mariadb-git-2b8cf60a853820e9aa2846eddda40f29424b5f50.tar.gz | |
Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj
into dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug23354
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/common/debugger/EventLogger.cpp | 2 | ||||
| -rw-r--r-- | ndb/src/mgmclient/CommandInterpreter.cpp | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ndb/src/common/debugger/EventLogger.cpp b/ndb/src/common/debugger/EventLogger.cpp index 6280d5bb9b3..c3bdb18dc06 100644 --- a/ndb/src/common/debugger/EventLogger.cpp +++ b/ndb/src/common/debugger/EventLogger.cpp @@ -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"); } diff --git a/ndb/src/mgmclient/CommandInterpreter.cpp b/ndb/src/mgmclient/CommandInterpreter.cpp index 8abce4f9cc4..8d3e046c9ad 100644 --- a/ndb/src/mgmclient/CommandInterpreter.cpp +++ b/ndb/src/mgmclient/CommandInterpreter.cpp @@ -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(); |