bk commit into 5.0 tree (lzhou:1.2476) BUG#23354

[lzhou]

Below is the list of changes that have just been committed into a local
5.0 repository of zhl. When zhl does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-13 10:42:21+00:00, lzhou@dev3-63.(none) +2 -0
  BUG#23354 Clear "no start" when nodes restart and add new prompting string when nodes
restart

  ndb/src/common/debugger/EventLogger.cpp@stripped, 2007-06-13 10:42:16+00:00,
lzhou@dev3-63.(none) +0 -2
    Remove "no start" from output when nodes restart.

  ndb/src/mgmclient/CommandInterpreter.cpp@stripped, 2007-06-13 10:42:16+00:00,
lzhou@dev3-63.(none) +10 -2
    Add new prompting string when nodes restart.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lzhou
# Host:	dev3-63.(none)
# Root:	/home/zhl/mysql/mysql-5.0/bug23354

--- 1.34/ndb/src/common/debugger/EventLogger.cpp	2007-06-13 10:42:36 +00:00
+++ 1.35/ndb/src/common/debugger/EventLogger.cpp	2007-06-13 10:42:36 +00:00
@@ -91,8 +91,6 @@ void getRestartAction(Uint32 action, Bas
   if (action == 0)
     return;
   str.appfmt(", restarting");
-  if (action & 2)
-    str.appfmt(", no start");
   if (action & 4)
     str.appfmt(", initial");
 }

--- 1.75/ndb/src/mgmclient/CommandInterpreter.cpp	2007-06-13 10:42:36 +00:00
+++ 1.76/ndb/src/mgmclient/CommandInterpreter.cpp	2007-06-13 10:42:36 +00:00
@@ -2026,7 +2026,7 @@ CommandInterpreter::executeRestart(Vecto
     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(Vecto
       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();