bzr push into mysql-5.1-telco-7.0 branch (maitrayi.sabaratnam:4964 to 4965)

[Maitrayi Sabaratnam]

 4965 Maitrayi Sabaratnam	2012-09-05
      Bug 14582294 - SPJ: GETNODES DOES NOT RETURN CORRCT ERROR CODE

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
 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
=== modified file 'storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2012-08-24 12:00:05 +0000
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2012-09-05 13:31:33 +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;

No bundle (reason: useless for push emails).