bk commit into 5.1 tree (knielsen:1.2608)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-09-24 17:07:32+02:00, knielsen@ymer.(none) +2 -0
  Minor cleanup found during ndbmtd development.

  storage/ndb/src/kernel/blocks/suma/Suma.hpp@stripped, 2007-09-24 17:07:27+02:00, knielsen@ymer.(none) +0 -1
    Minor cleanup found during ndbmtd development.

  storage/ndb/src/kernel/vm/SimulatedBlock.cpp@stripped, 2007-09-24 17:07:27+02:00, knielsen@ymer.(none) +2 -10
    Minor cleanup found during ndbmtd development.

diff -Nrup a/storage/ndb/src/kernel/blocks/suma/Suma.hpp b/storage/ndb/src/kernel/blocks/suma/Suma.hpp
--- a/storage/ndb/src/kernel/blocks/suma/Suma.hpp	2007-09-05 15:19:57 +02:00
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.hpp	2007-09-24 17:07:27 +02:00
@@ -283,7 +283,6 @@ public:
      * Create triggers
      */
     int setupTrigger(Signal* signal, Suma &suma);
-    void completeTrigger(Signal* signal);
     void createAttributeMask(AttributeMask&, Suma &suma);
     
     /**
diff -Nrup a/storage/ndb/src/kernel/vm/SimulatedBlock.cpp b/storage/ndb/src/kernel/vm/SimulatedBlock.cpp
--- a/storage/ndb/src/kernel/vm/SimulatedBlock.cpp	2007-06-14 16:10:10 +02:00
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock.cpp	2007-09-24 17:07:27 +02:00
@@ -42,6 +42,7 @@
 #include <EventLogger.hpp>
 extern EventLogger g_eventLogger;
 
+
 #define ljamEntry() jamEntryLine(30000 + __LINE__)
 #define ljam() jamLine(30000 + __LINE__)
 
@@ -231,7 +232,6 @@ SimulatedBlock::sendSignal(BlockReferenc
   if(recNode == ourProcessor || recNode == 0) {
     signal->header.theSendersSignalId = tSignalId;
     signal->header.theSendersBlockRef = sendBRef;
-    signal->header.theLength = length;
     globalScheduler.execute(signal, jobBuffer, recBlock,
 			    gsn);
     signal->header.m_noOfSections = 0;
@@ -580,18 +580,11 @@ SimulatedBlock::sendSignalWithDelay(Bloc
   
   BlockNumber bnr = refToBlock(ref);
   
-  //BlockNumber sendBnr = number();
-  BlockReference sendBRef = reference();
-  
-  if (bnr == 0) {
-    bnr_error();
-  }//if
-  
   signal->header.theLength = length;
   signal->header.theSendersSignalId = signal->header.theSignalId;
-  signal->header.theSendersBlockRef = sendBRef;
   signal->header.theVerId_signalNumber = gsn;
   signal->header.theReceiversBlockNumber = bnr;
+  signal->header.theSendersBlockRef = reference();
 
 #ifdef VM_TRACE
   {
@@ -2076,4 +2069,3 @@ SimulatedBlock::create_distr_key(Uint32 
 }
 
 CArray<KeyDescriptor> g_key_descriptor_pool;
-