bzr push into mysql-5.1-telco-7.0-trpman branch (jonas.oreland:4677 to 4678)

[jonas oreland]

 4678 jonas oreland	2011-11-18
      70 - trpman - continue trial/error searching for bug - attempt 5 - this time an actual code change

    modified:
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp
 4677 jonas oreland	2011-11-18
      70 - trpman - continue trial/error searching for bug - attempt 4

    modified:
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
      storage/ndb/src/kernel/vm/TransporterCallback.cpp
=== modified file 'storage/ndb/src/kernel/vm/SimulatedBlock.cpp'
--- a/storage/ndb/src/kernel/vm/SimulatedBlock.cpp	2011-10-20 16:18:28 +0000
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock.cpp	2011-11-18 11:38:57 +0000
@@ -1837,18 +1837,11 @@ SimulatedBlock::infoEvent(const char * m
    * Init and put it into the job buffer
    */
   memset(&signalT.header, 0, sizeof(SignalHeader));
-  
-  const Signal * signal = globalScheduler.getVMSignals();
-  Uint32 tTrace = signal->header.theTrace;
-  Uint32 tSignalId = signal->header.theSignalId;
-  
   signalT.header.theVerId_signalNumber   = GSN_EVENT_REP;
   signalT.header.theReceiversBlockNumber = CMVMI;
   signalT.header.theSendersBlockRef      = reference();
-  signalT.header.theTrace                = tTrace;
-  signalT.header.theSignalId             = tSignalId;
   signalT.header.theLength               = (Uint32)((len+3)/4)+1;
-  
+
 #ifdef NDBD_MULTITHREADED
   sendlocal(m_threadId,
             &signalT.header, signalT.theData, signalT.m_sectionPtrI);
@@ -1882,16 +1875,9 @@ SimulatedBlock::warningEvent(const char
    * Init and put it into the job buffer
    */
   memset(&signalT.header, 0, sizeof(SignalHeader));
-  
-  const Signal * signal = globalScheduler.getVMSignals();
-  Uint32 tTrace = signal->header.theTrace;
-  Uint32 tSignalId = signal->header.theSignalId;
-  
   signalT.header.theVerId_signalNumber   = GSN_EVENT_REP;
   signalT.header.theReceiversBlockNumber = CMVMI;
   signalT.header.theSendersBlockRef      = reference();
-  signalT.header.theTrace                = tTrace;
-  signalT.header.theSignalId             = tSignalId;
   signalT.header.theLength               = (Uint32)((len+3)/4)+1;
 
 #ifdef NDBD_MULTITHREADED

No bundle (reason: useless for push emails).