bzr push into mysql-5.1-telco-7.0 branch (jonas:3990 to 3991) Bug#58110

[Jonas Oreland]

 3991 Jonas Oreland	2010-11-10 [merge]
      ndb - bug#58110 - merge plus additional 7.0 change of TcKeyReq::MaxTotalAttrInfo

    modified:
      storage/ndb/include/kernel/signaldata/TcKeyReq.hpp
      storage/ndb/src/ndbapi/NdbTransaction.cpp
      storage/ndb/test/ndbapi/testNdbApi.cpp
 3990 Jonas Oreland	2010-11-10
      ndb - 1) clear error codes in testDict -n FailXXX 2) make sure error code 0 is passed to all blocks 3) fix bug in setting of default values in testDict

    modified:
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
      storage/ndb/test/ndbapi/testDict.cpp
=== modified file 'storage/ndb/include/kernel/signaldata/TcKeyReq.hpp'
--- a/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp	2010-01-28 15:16:46 +0000
+++ b/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp	2010-11-10 12:28:34 +0000
@@ -20,6 +20,7 @@
 #define TC_KEY_REQ_H
 
 #include "SignalData.hpp"
+#include <transporter/TransporterDefinitions.hpp>
 
 /**
  * @class TcKeyReq
@@ -74,7 +75,8 @@ public:
   STATIC_CONST( SignalLength = 25 );
   STATIC_CONST( MaxKeyInfo = 8 );
   STATIC_CONST( MaxAttrInfo = 5 );
-  STATIC_CONST( MaxTotalAttrInfo = 0xFFFF );
+  STATIC_CONST( MaxTotalAttrInfo = ((MAX_SEND_MESSAGE_BYTESIZE / 4) - 
+                                    SignalLength ));
 
   /**
    * Long signal variant of TCKEYREQ

=== modified file 'storage/ndb/src/ndbapi/NdbTransaction.cpp'
--- a/storage/ndb/src/ndbapi/NdbTransaction.cpp	2010-11-09 20:40:03 +0000
+++ b/storage/ndb/src/ndbapi/NdbTransaction.cpp	2010-11-10 12:28:34 +0000
@@ -882,8 +882,7 @@ NdbTransaction::doSend()
       const Uint32 lastFlag = ((tNextOp == NULL) ? 1 : 0);
       const int tReturnCode = tOp->doSend(theDBnode, lastFlag);
       if (tReturnCode == -1) {
-        theReturnStatus = ReturnFailure;
-        break;
+        goto fail;
       }//if
       tOp = tNextOp;
     } while (tOp != NULL);
@@ -921,10 +920,12 @@ NdbTransaction::doSend()
     abort();
     break;
   }//switch
-  setOperationErrorCodeAbort(4002);
+
   theReleaseOnClose = true;
   theTransactionIsStarted = false;
   theCommitStatus = Aborted;
+fail:
+  setOperationErrorCodeAbort(4002);
   DBUG_RETURN(-1);
 }//NdbTransaction::doSend()
 

=== modified file 'storage/ndb/test/ndbapi/testNdbApi.cpp'
--- a/storage/ndb/test/ndbapi/testNdbApi.cpp	2010-11-05 10:26:02 +0000
+++ b/storage/ndb/test/ndbapi/testNdbApi.cpp	2010-11-10 12:28:34 +0000
@@ -351,6 +351,7 @@ int runTestGetValue(NDBT_Context* ctx, N
       case 880: // TUP - Read too much
       case 823: // TUP - Too much AI
       case 4257: // NDBAPI - Too much AI
+      case 4002: // NDBAPI - send problem
 	// OK errors
 	ERR(pCon->getNdbError());
 	break;

No bundle (reason: useless for push emails).