Commit 6bead54d authored by unknown's avatar unknown

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
parents 85b4a64c 46bca215
...@@ -90,6 +90,8 @@ void getRestartAction(Uint32 action, BaseString &str) ...@@ -90,6 +90,8 @@ void getRestartAction(Uint32 action, BaseString &str)
if (action == 0) if (action == 0)
return; return;
str.appfmt(", restarting"); str.appfmt(", restarting");
if (action & 2)
str.appfmt(", no start");
if (action & 4) if (action & 4)
str.appfmt(", initial"); str.appfmt(", initial");
} }
......
...@@ -2106,15 +2106,7 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list, ...@@ -2106,15 +2106,7 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list,
ndbout << "Node"; ndbout << "Node";
for (int i= 0; i < no_of_nodes; i++) for (int i= 0; i < no_of_nodes; i++)
ndbout << " " << node_ids[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) if(need_disconnect)
disconnect(); disconnect();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment