bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4763 to 4764)

[jonas oreland]

 4764 jonas oreland	2011-12-23
      ndb - fix 2 minor bugs, that are not exposable in current code 1) having more than 1 deferred trigger (currently 0 is used) 2) if sending keyinfo20 locally

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
 4763 Mauritz Sundell	2011-12-23
      ndb - missing files added. test_context.?pp

    added:
      storage/ndb/src/kernel/vm/test_context.cpp
      storage/ndb/src/kernel/vm/test_context.hpp
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2011-11-25 09:42:02 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2011-12-23 11:04:03 +0000
@@ -4617,11 +4617,11 @@ void Dblqh::execLQHKEYREQ(Signal* signal
     nextPos += 2;
   }
 
+  regTcPtr->m_fire_trig_pass = 0;
   Uint32 Tdeferred = LqhKeyReq::getDeferredConstraints(Treqinfo);
   if (isLongReq && Tdeferred)
   {
     regTcPtr->m_flags |= TcConnectionrec::OP_DEFERRED_CONSTRAINTS;
-    regTcPtr->m_fire_trig_pass = 0;
   }
 
   UintR TitcKeyLen = 0;
@@ -11910,6 +11910,12 @@ Uint32 Dblqh::sendKeyinfo20(Signal* sign
 #endif
   const bool longable = true; // TODO is_api && !old_dest;
 
+  if (isNdbMtLqh())
+  {
+    jam();
+    nodeId = 0; // prevent execute direct
+  }
+
   Uint32 * dst = keyInfo->keyData;
   dst += nodeId == getOwnNodeId() ? 0 : KeyInfo20::DataLength;
 
@@ -11943,11 +11949,6 @@ Uint32 Dblqh::sendKeyinfo20(Signal* sign
   {
     jam();
     
-    if (isNdbMtLqh() && instance() != refToInstance(ref))
-    {
-      jam();
-      nodeId = 0; // prevent execute direct
-    }
     if (nodeId == getOwnNodeId())
     {
       EXECUTE_DIRECT(refToBlock(ref), GSN_KEYINFO20, signal,

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2011-12-23 11:04:03 +0000
@@ -741,6 +741,7 @@ Dbtup::checkDeferredTriggersDuringPrepar
       NoOfFiredTriggers::setDeferredBit(req_struct->no_fired_triggers);
       return;
     }
+    triggerList.next(trigPtr);
   }
 }
 

No bundle (reason: useless for push emails).