Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

into mysql.com:/home/jonas/src/mysql-4.1-ndb

ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp

@@ -2313,6 +2313,18 @@ void Ndbcntr::execWAIT_GCP_REF(Signal* signal){
 void Ndbcntr::execWAIT_GCP_CONF(Signal* signal){
   jamEntry();
 
+  ndbrequire(StopReq::getSystemStop(c_stopRec.stopReq.requestInfo));
+  NodeState newState(NodeState::SL_STOPPING_3, true); 
+
+  /**
+   * Inform QMGR so that arbitrator won't kill us
+   */
+  NodeStateRep * rep = (NodeStateRep *)&signal->theData[0];
+  rep->nodeState = newState;
+  rep->nodeState.masterNodeId = cmasterNodeId;
+  rep->nodeState.setNodeGroup(c_nodeGroup);
+  EXECUTE_DIRECT(QMGR, GSN_NODE_STATE_REP, signal, NodeStateRep::SignalLength);
+
   if(StopReq::getPerformRestart(c_stopRec.stopReq.requestInfo)){
     jam();
     StartOrd * startOrd = (StartOrd *)&signal->theData[0];

ndb/src/kernel/blocks/qmgr/QmgrMain.cpp

@@ -2311,6 +2311,15 @@ void Qmgr::execPREP_FAILCONF(Signal* signal)
    * Continues via sendCommitFailReq() if successful.
    */
   arbitRec.failureNr = cfailureNr;
+  const NodeState & s = getNodeState();
+  if(s.startLevel == NodeState::SL_STOPPING_3 && s.stopping.systemShutdown){
+    jam();
+    /**
+     * We're performing a system shutdown, 
+     * don't let artibtrator shut us down
+     */
+    return;
+  }
   handleArbitCheck(signal);
   return;
 }//Qmgr::execPREP_FAILCONF()

ndb/test/run-test/daily-basic-tests.txt

@@ -794,3 +794,39 @@ max-time: 300
 cmd: testBlobs
 args:
 
+max-time: 2500
+cmd: testOIBasic
+args: 
+
+#
+#
+# SYSTEM RESTARTS
+#
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR1 T1 
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR1 T6 
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR1 T7 
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR1 T8 
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR2 T1 
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR2 T6 
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR2 T7 
+

ndb/test/run-test/daily-devel-tests.txt

@@ -37,34 +37,6 @@ args: -n SingleUserMode T1
 #
 # SYSTEM RESTARTS
 #
-max-time: 1500
-cmd: testSystemRestart
-args: -n SR1 T1 
-
-max-time: 1500
-cmd: testSystemRestart
-args: -n SR1 T6 
-
-max-time: 1500
-cmd: testSystemRestart
-args: -n SR1 T7 
-
-max-time: 1500
-cmd: testSystemRestart
-args: -n SR1 T8 
-
-max-time: 1500
-cmd: testSystemRestart
-args: -n SR2 T1 
-
-max-time: 1500
-cmd: testSystemRestart
-args: -n SR2 T6 
-
-max-time: 1500
-cmd: testSystemRestart
-args: -n SR2 T7 
-
 max-time: 1500
 cmd: testSystemRestart
 args: -n SR_UNDO T1 
@@ -230,7 +202,3 @@ max-time: 2500
 cmd: test_event
 args: -n BasicEventOperation T1 T6 
 
-max-time: 2500
-cmd: testOIBasic
-args: 
-