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

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");
 }

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();