Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

2 files changed, 3 insertions, 9 deletions

diff --git a/storage/ndb/src/common/debugger/EventLogger.cpp b/storage/ndb/src/common/debugger/EventLogger.cpp
index c7f9a42f39e..0964a54f906 100644
--- a/storage/ndb/src/common/debugger/EventLogger.cpp
+++ b/storage/ndb/src/common/debugger/EventLogger.cpp
@@ -90,6 +90,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/storage/ndb/src/mgmclient/CommandInterpreter.cpp b/storage/ndb/src/mgmclient/CommandInterpreter.cpp
index 8d9197574dd..875cc2771ae 100644
--- a/storage/ndb/src/mgmclient/CommandInterpreter.cpp
+++ b/storage/ndb/src/mgmclient/CommandInterpreter.cpp
@@ -2106,15 +2106,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();