bk commit into 5.1 tree (lzhou:1.2578) BUG#31056

[lzhou]

Below is the list of changes that have just been committed into a local
5.1 repository of lzhou.  When lzhou 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, 2008-04-30 11:27:58+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#31056 Limited node restart in sigle user mode

  storage/ndb/src/mgmclient/CommandInterpreter.cpp@stripped, 2008-04-30 11:27:47+00:00, lzhou@dev3-63.(none) +23 -0
    Limited restart operation in single user mode

diff -Nrup a/storage/ndb/src/mgmclient/CommandInterpreter.cpp b/storage/ndb/src/mgmclient/CommandInterpreter.cpp
--- a/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2008-03-14 13:25:28 +00:00
+++ b/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2008-04-30 11:27:47 +00:00
@@ -2127,6 +2127,29 @@ CommandInterpreter::executeRestart(Vecto
   if (nostart)
     ndbout_c("Shutting down nodes with \"-n, no start\" option, to subsequently start the nodes.");
 
+  ndb_mgm_node_type types[2] = {
+    NDB_MGM_NODE_TYPE_NDB,
+    NDB_MGM_NODE_TYPE_UNKNOWN
+  };
+  struct ndb_mgm_cluster_state *cl;
+  cl = ndb_mgm_get_status2(m_mgmsrv, types);
+
+  if(cl == NULL)
+  {
+    ndbout_c("Cannot get status of nodes");
+    printError();
+    return -1;
+  }
+  NdbAutoPtr<char> ap1((char*)cl);
+
+  for (int i = 0; i<cl->no_of_nodes; i++)
+    if((cl->node_states+i)->node_status == NDB_MGM_NODE_STATUS_SINGLEUSER)
+    {
+      ndbout_c("Cannot restart nodes: single user mode");
+      printError();
+      return -1;
+    }
+ 
   result= ndb_mgm_restart3(m_mgmsrv, no_of_nodes, node_ids,
                            initialstart, nostart, abort, &need_disconnect);