bzr commit into mysql-5.1-telco-7.0 branch (jonas:3989)

[Jonas Oreland]

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

 3989 Jonas Oreland	2010-11-10
      ndb - EXECUTE_DIRECT was recently modified to always (not only if globalTestOn) set senderBlockRef, adopt SIGNAL_DROPPED-handling to use SimulatedBlock::executeFunction() rather than EXECUTE_DIRECT

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp
=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2010-10-28 07:11:34 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2010-11-10 08:40:08 +0000
@@ -9786,8 +9786,7 @@ bool Dbtc::testFragmentDrop(Signal* sign
     signal->header.theLength = newLen + 3;
     signal->header.m_noOfSections = 0;
 
-    EXECUTE_DIRECT(DBTC, GSN_SIGNAL_DROPPED_REP, signal,
-                   newLen + 3);
+    executeFunction(GSN_SIGNAL_DROPPED_REP, signal);
     return true;
   }
   return false;

=== modified file 'storage/ndb/src/kernel/vm/SimulatedBlock.cpp'
--- a/storage/ndb/src/kernel/vm/SimulatedBlock.cpp	2010-10-20 07:12:58 +0000
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock.cpp	2010-11-10 08:40:08 +0000
@@ -2322,9 +2322,12 @@ SimulatedBlock::assembleFragments(Signal
       signal->header.m_fragmentInfo = 3;
 
 
+      /**
+       * NOTE: Don't use EXECUTE_DIRECT as it 
+       *       sets sendersBlockRef to reference()
+       */
       /* Perform dropped signal handling, in this thread, now */
-      EXECUTE_DIRECT(theNumber, GSN_SIGNAL_DROPPED_REP, 
-                     signal, signal->header.theLength);
+      executeFunction(GSN_SIGNAL_DROPPED_REP, signal);
       
       /* return false to caller - they should not process the signal */
       return false;

=== modified file 'storage/ndb/src/kernel/vm/SimulatedBlock.hpp'
--- a/storage/ndb/src/kernel/vm/SimulatedBlock.hpp	2010-11-04 07:12:01 +0000
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock.hpp	2010-11-10 08:40:08 +0000
@@ -1276,17 +1276,6 @@ SimulatedBlock::EXECUTE_DIRECT(Uint32 bl
   m_currentGsn = tGsn;
   subTime(tGsn, diff);
 #endif
-#ifdef VM_TRACE
-  if(globalData.testOn){
-    signal->header.theVerId_signalNumber = gsn;
-    signal->header.theReceiversBlockNumber = numberToBlock(block, instanceNo);
-    signal->header.theSendersBlockRef = reference();
-    globalSignalLoggers.executeDirect(signal->header,
-				      1,        // out
-				      &signal->theData[0],
-                                      globalData.ownId);
-  }
-#endif
 }
 
 /**


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