bzr commit into mysql-5.1-telco-7.0 branch (jonas:3053) Bug#47715

[Jonas Oreland]

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

 3053 Jonas Oreland	2009-09-29 [merge]
      ndb - merge bug#47715

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2009-09-29 13:13:18 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2009-09-29 14:02:31 +0000
@@ -8362,6 +8362,12 @@ void Dblqh::execNODE_FAILREP(Signal* sig
 void Dblqh::execLQH_TRANSREQ(Signal* signal) 
 {
   jamEntry();
+
+  if (!checkNodeFailSequence(signal))
+  {
+    jam();
+    return;
+  }
   Uint32 newTcPtr = signal->theData[0];
   BlockReference newTcBlockref = signal->theData[1];
   Uint32 oldNodeId = signal->theData[2];

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.cpp	2009-09-29 13:46:21 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.cpp	2009-09-29 14:02:31 +0000
@@ -1332,6 +1332,13 @@ DblqhProxy::sendSTART_RECCONF_2(Signal* 
 void
 DblqhProxy::execLQH_TRANSREQ(Signal* signal)
 {
+  jamEntry();
+  
+  if (!checkNodeFailSequence(signal))
+  {
+    jam();
+    return;
+  }
   const LqhTransReq* req = (const LqhTransReq*)signal->getDataPtr();
   Ss_LQH_TRANSREQ& ss = ssSeize<Ss_LQH_TRANSREQ>();
   ss.m_req = *req;


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