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

[jonas oreland]

 4679 jonas oreland	2011-11-18
      ndb - trial and terror...

    modified:
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp
 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
=== modified file 'storage/ndb/src/kernel/vm/SimulatedBlock.cpp'
--- a/storage/ndb/src/kernel/vm/SimulatedBlock.cpp	2011-11-18 11:38:57 +0000
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock.cpp	2011-11-18 13:41:28 +0000
@@ -1837,18 +1837,8 @@ SimulatedBlock::infoEvent(const char * m
    * Init and put it into the job buffer
    */
   memset(&signalT.header, 0, sizeof(SignalHeader));
-  signalT.header.theVerId_signalNumber   = GSN_EVENT_REP;
-  signalT.header.theReceiversBlockNumber = CMVMI;
-  signalT.header.theSendersBlockRef      = reference();
-  signalT.header.theLength               = (Uint32)((len+3)/4)+1;
-
-#ifdef NDBD_MULTITHREADED
-  sendlocal(m_threadId,
-            &signalT.header, signalT.theData, signalT.m_sectionPtrI);
-#else
-  globalScheduler.execute(&signalT.header, JBB, signalT.theData,
-                          signalT.m_sectionPtrI);
-#endif
+  sendSignal(CMVMI_REF, GSN_EVENT_REP, (Signal*)&signalT,
+             (Uint32)((len+3)/4)+1, JBB);
 }
 
 void 
@@ -1875,18 +1865,8 @@ SimulatedBlock::warningEvent(const char
    * Init and put it into the job buffer
    */
   memset(&signalT.header, 0, sizeof(SignalHeader));
-  signalT.header.theVerId_signalNumber   = GSN_EVENT_REP;
-  signalT.header.theReceiversBlockNumber = CMVMI;
-  signalT.header.theSendersBlockRef      = reference();
-  signalT.header.theLength               = (Uint32)((len+3)/4)+1;
-
-#ifdef NDBD_MULTITHREADED
-  sendlocal(m_threadId,
-            &signalT.header, signalT.theData, signalT.m_sectionPtrI);
-#else
-  globalScheduler.execute(&signalT.header, JBB, signalT.theData,
-                          signalT.m_sectionPtrI);
-#endif
+  sendSignal(CMVMI_REF, GSN_EVENT_REP, (Signal*)&signalT,
+             (Uint32)((len+3)/4)+1, JBB);
 }
 
 void

No bundle (reason: useless for push emails).