bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3339)

[Jonas Oreland]

#At file:///home/jonas/src/70-spj-svs/ based on revid:jonas@stripped

 3339 Jonas Oreland	2010-11-04
      ndb - sps-svs - revert unused change

    modified:
      storage/ndb/include/kernel/signaldata/TupKey.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp
=== modified file 'storage/ndb/include/kernel/signaldata/TupKey.hpp'
--- a/storage/ndb/include/kernel/signaldata/TupKey.hpp	2009-08-19 08:35:25 +0000
+++ b/storage/ndb/include/kernel/signaldata/TupKey.hpp	2010-11-04 09:41:08 +0000
@@ -38,7 +38,7 @@ class TupKeyReq {
   friend bool printTUPKEYREQ(FILE * output, const Uint32 * theData, Uint32 len, Uint16 receiverBlockNo);
 
 public:
-  STATIC_CONST( SignalLength = 21 );
+  STATIC_CONST( SignalLength = 19 );
 
 private:
 
@@ -64,8 +64,6 @@ private:
   Uint32 m_row_id_page_no;
   Uint32 m_row_id_page_idx;
   Uint32 attrInfoIVal;
-  Uint32 rootStreamId;
-  Uint32 anyValue;
 };
 
 class TupKeyConf {

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2010-11-03 14:11:46 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2010-11-04 09:41:08 +0000
@@ -4187,7 +4187,7 @@ void Dblqh::execSIGNAL_DROPPED_REP(Signa
     ref->transId1= transid1;
     ref->transId2= transid2;
     ref->errorCode= ZGET_ATTRINBUF_ERROR;
-
+    
     sendSignal(signal->senderBlockRef(), GSN_SCAN_FRAGREF, signal,
                ScanFragRef::SignalLength, JBB);
     break;
@@ -4217,15 +4217,6 @@ void Dblqh::execLQHKEYREQ(Signal* signal
   const LqhKeyReq * const lqhKeyReq = (LqhKeyReq *)signal->getDataPtr();
   SectionHandle handle(this, signal);
 
-#ifdef UNUSED
-  ndbout << "LQH: Received LQHKEYREQ from TC instance" 
-	 << refToInstance(lqhKeyReq->tcBlockref) 
-	 << " hashValue=" << lqhKeyReq->hashValue
-         << " transId1=" << lqhKeyReq-> transId1
-         << " transId2=" << lqhKeyReq-> transId2
-	 << " handle.m_cnt=" << handle.m_cnt
-	 << endl;
-#endif /*UNUSED*/
   {
     const NodeBitmask& all = globalTransporterRegistry.get_status_overloaded();
     if (unlikely(!all.isclear() &&
@@ -4541,8 +4532,7 @@ void Dblqh::execLQHKEYREQ(Signal* signal
   }
   else if(op == ZINSERT)
   {
-    ndbassert(refToBlock(senderRef) == DBTC || 
-	      refToBlock(senderRef) == DBSPJ);
+    ndbassert(refToBlock(senderRef) == DBTC);
   }
   
   if ((LqhKeyReq::FixedSignalLength + nextPos + TreclenAiLqhkey) != 

=== modified file 'storage/ndb/src/kernel/vm/SimulatedBlock.cpp'
--- a/storage/ndb/src/kernel/vm/SimulatedBlock.cpp	2010-10-29 20:45:08 +0000
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock.cpp	2010-11-04 09:41:08 +0000
@@ -571,7 +571,7 @@ SimulatedBlock::sendSignal(BlockReferenc
                                                &signal->theData[0], recNode,
                                                (LinearSectionPtr*)0);
 #endif
-
+    
     if (unlikely(! (ss == SEND_OK ||
                     ss == SEND_BLOCKED ||
                     ss == SEND_DISCONNECTED)))


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