bzr push into mysql-5.1-telco-7.0 branch (jan.wedvik:4963 to 4964) Bug#14190114

[Jan Wedvik]

 4964 Jan Wedvik	2012-08-30
      This commit is a followup to 
      revno 4960 / revid:jan.wedvik@stripped
      which was a fix for 'Bug#14190114: CLUSTER CRASH DUE TO NDBREQUIRE IN 
      ./LOCALPROXY.HPP DBLQH (LINE: 234)'.
      
      When running ndbautottest, the regression test for bug 14190114 
      (runDropTakeoverTest()) would always fail. The reason for this was that
      another regression test (runBug13416603()) would leave some data nodes
      in a state where they would not start again after stopping because
      of an error insert. This commit fixes this problem by adding cleanup
      code to runBug13416603().

    modified:
      storage/ndb/test/ndbapi/testDict.cpp
 4963 Maitrayi Sabaratnam	2012-08-28
      BUG#14220269 CLUSTER WIDE SHUTDOWN POINTER TOO LARGE IN DBDIH

    modified:
      storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/test/ndbapi/testDict.cpp
=== modified file 'storage/ndb/test/ndbapi/testDict.cpp'
--- a/storage/ndb/test/ndbapi/testDict.cpp	2012-08-28 11:22:02 +0000
+++ b/storage/ndb/test/ndbapi/testDict.cpp	2012-08-30 08:40:49 +0000
@@ -32,6 +32,7 @@
 #include <NdbEnv.h>
 #include <ndb_rand.h>
 #include <Bitmask.hpp>
+#include <../src/kernel/ndbd.hpp>
 
 #define ERR_INSERT_MASTER_FAILURE1 6013
 #define ERR_INSERT_MASTER_FAILURE2 6014
@@ -9123,6 +9124,16 @@ cleanup:
     is.drop_systables(pNdb);
   }
 
+  // Ensure that nodes will start after error inserts again.
+  {
+    const int restartState[] = 
+      { DumpStateOrd::CmvmiSetRestartOnErrorInsert, NRT_DoStart_Restart };
+    
+    require(res.dumpStateAllNodes(restartState,
+                                  sizeof restartState/sizeof restartState[0])
+            == 0);
+  }
+
   return NDBT_OK;
 
 err:

No bundle (reason: useless for push emails).