diff options
author | tomas@whalegate.ndb.mysql.com <> | 2007-09-12 13:53:32 +0200 |
---|---|---|
committer | tomas@whalegate.ndb.mysql.com <> | 2007-09-12 13:53:32 +0200 |
commit | 461a3dccaca7e9435cf65071760b3e47bccfc63b (patch) | |
tree | 599693afaded9003d9f558c19658cb703c8c2e7c /ndb | |
parent | 0f22183652dd1a578b029f99da758f6142e34bdc (diff) | |
download | mariadb-git-461a3dccaca7e9435cf65071760b3e47bccfc63b.tar.gz |
BUG#23354 revert
Diffstat (limited to 'ndb')
-rw-r--r-- | ndb/src/common/debugger/EventLogger.cpp | 2 | ||||
-rw-r--r-- | ndb/src/mgmclient/CommandInterpreter.cpp | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/ndb/src/common/debugger/EventLogger.cpp b/ndb/src/common/debugger/EventLogger.cpp index c3bdb18dc06..6280d5bb9b3 100644 --- a/ndb/src/common/debugger/EventLogger.cpp +++ b/ndb/src/common/debugger/EventLogger.cpp @@ -91,6 +91,8 @@ 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 8d3e046c9ad..1036461d404 100644 --- a/ndb/src/mgmclient/CommandInterpreter.cpp +++ b/ndb/src/mgmclient/CommandInterpreter.cpp @@ -2168,15 +2168,7 @@ 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 << "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"); + ndbout_c(" is being restarted"); } if(need_disconnect) disconnect(); |