bzr push into mysql-5.1-telco-7.1 branch (maitrayi.sabaratnam:4598 to 4599)

[Maitrayi Sabaratnam]

 4599 Maitrayi Sabaratnam	2012-09-05 [merge]
      Merge 7.0->7.1

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/test/ndbapi/testDict.cpp
 4598 Maitrayi Sabaratnam	2012-08-28 [merge]
      Merge 70 to 71

    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/src/kernel/blocks/dbspj/DbspjMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2012-08-24 12:01:20 +0000
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2012-09-05 14:21:11 +0000
@@ -3991,7 +3991,6 @@ Dbspj::computePartitionHash(Signal* sign
 Uint32
 Dbspj::getNodes(Signal* signal, BuildKeyReq& dst, Uint32 tableId)
 {
-  Uint32 err;
   DiGetNodesReq * req = (DiGetNodesReq *)&signal->theData[0];
   req->tableId = tableId;
   req->hashValue = dst.hashInfo[1];
@@ -4009,7 +4008,7 @@ Dbspj::getNodes(Signal* signal, BuildKey
 #endif
 
   DiGetNodesConf * conf = (DiGetNodesConf *)&signal->theData[0];
-  err = signal->theData[0];
+  const Uint32 err = signal->theData[0] ? signal->theData[1] : 0; 
   Uint32 Tdata2 = conf->reqinfo;
   Uint32 nodeId = conf->nodes[0];
   Uint32 instanceKey = (Tdata2 >> 24) & 127;

=== 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).