bk commit into 5.1 tree (justin.he:1.2552) BUG#30357

[Justin He]

Below is the list of changes that have just been committed into a local
5.1 repository of justin.he. When justin.he 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-09-17 06:54:37+00:00, justin.he@stripped +1 -0
  Bug#30357, ndb_mgm report incorrect msg after stop NDB node when single user mode

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp@stripped, 2007-09-17 06:54:23+00:00, justin.he@stripped +6 -0
    add check single user mode, then return correct err code

diff -Nrup a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2007-06-14 09:26:52 +00:00
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2007-09-17 06:54:23 +00:00
@@ -1154,6 +1154,12 @@ int MgmtSrvr::stopNodes(const Vector<Nod
     while(getNextNodeId(&nodeId, NDB_MGM_NODE_TYPE_NDB))
     {
       node = theFacade->theClusterMgr->getNodeInfo(nodeId);
+      /*
+       * If stop MGM and partial NDB nodes,
+       * Operation not allowed or aborted due to single user mode
+       */
+      if(node.m_state.startLevel == NodeState::SL_SINGLEUSER)
+        return 299;  
       if((node.m_state.startLevel != NodeState::SL_STARTED) && 
 	 (node.m_state.startLevel != NodeState::SL_NOTHING))
 	return OPERATION_NOT_ALLOWED_START_STOP;