bzr commit into mysql-5.1-telco-6.3 branch (jonas:3370)

[jonas oreland]

#At file:///home/jonas/src/telco-6.3/ based on revid:bocklin@stripped

 3370 jonas oreland	2010-12-22
      ndb - Fix length of GSN_NF_COMPLETEREP/GSN_NODE_FAILREP in SignalSender

    modified:
      storage/ndb/src/ndbapi/SignalSender.cpp
=== modified file 'storage/ndb/src/ndbapi/SignalSender.cpp'
--- a/storage/ndb/src/ndbapi/SignalSender.cpp	2010-10-01 09:45:39 +0000
+++ b/storage/ndb/src/ndbapi/SignalSender.cpp	2010-12-22 19:03:22 +0000
@@ -154,6 +154,7 @@ SignalSender::waitFor(Uint32 timeOutMill
     {
       return 0;
     }
+    assert(s->header.theLength > 0);
     return s;
   }
   
@@ -172,6 +173,7 @@ SignalSender::waitFor(Uint32 timeOutMill
       {
         return 0;
       }
+      assert(s->header.theLength > 0);
       return s;
     }
     
@@ -271,6 +273,7 @@ ok:
   {
     // node shutdown complete
     s->header.theVerId_signalNumber = GSN_NF_COMPLETEREP;
+    s->header.theLength = NFCompleteRep::SignalLength;
     NFCompleteRep *rep = (NFCompleteRep *)s->getDataPtrSend();
     rep->blockNo = 0;
     rep->nodeId = 0;
@@ -282,6 +285,7 @@ ok:
   {
     // node failure
     s->header.theVerId_signalNumber = GSN_NODE_FAILREP;
+    s->header.theLength = NodeFailRep::SignalLength;
     NodeFailRep *rep = (NodeFailRep *)s->getDataPtrSend();
     rep->failNo = 0;
     rep->masterNodeId = 0;


Attachment: [text/bzr-bundle] bzr/[e-mail]