BUG#23354 Clear "no start" when nodes restart and add new prompting string when nodes restart

ndb/src/common/debugger/EventLogger.cpp:
  Remove "no start" from output when nodes restart.
ndb/src/mgmclient/CommandInterpreter.cpp:
  Add new prompting string when nodes restart.

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 2265579ad1e..eb70601057d 100644
--- a/ndb/src/mgmclient/CommandInterpreter.cpp
+++ b/ndb/src/mgmclient/CommandInterpreter.cpp
@@ -2026,7 +2026,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,
@@ -2046,7 +2046,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();