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

[Jonas Oreland]

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

 3825 Jonas Oreland	2010-10-04
      ndb - replace ScanFragNextReq::closeFlag with ScanFragNextReq::requestInfo

    modified:
      storage/ndb/include/kernel/signaldata/ScanFrag.hpp
      storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
=== modified file 'storage/ndb/include/kernel/signaldata/ScanFrag.hpp'
--- a/storage/ndb/include/kernel/signaldata/ScanFrag.hpp	2009-05-27 15:21:45 +0000
+++ b/storage/ndb/include/kernel/signaldata/ScanFrag.hpp	2010-10-04 11:13:22 +0000
@@ -229,11 +229,16 @@ public:
   
 public:
   Uint32 senderData;
-  Uint32 closeFlag;
+  Uint32 requestInfo; // 1 == close
   Uint32 transId1;
   Uint32 transId2;
   Uint32 batch_size_rows;
   Uint32 batch_size_bytes;
+
+  STATIC_CONST( ZCLOSE = 1 );
+
+  Uint32 getCloseFlag(const Uint32&);
+  void setCloseFlag(Uint32&, Uint32);
 };
 
 /**

=== modified file 'storage/ndb/src/common/debugger/signaldata/ScanTab.cpp'
--- a/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp	2009-05-26 18:53:34 +0000
+++ b/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp	2010-10-04 11:13:22 +0000
@@ -125,7 +125,7 @@ printSCANFRAGNEXTREQ(FILE * output, cons
   fprintf(output, " transId(1, 2): (H\'%.8x, H\'%.8x)\n",
 	  sig->transId1, sig->transId2);
   
-  fprintf(output, " Close scan: %u\n", sig->closeFlag);
+  fprintf(output, " requestInfo: 0x%.8x\n", sig->requestInfo);
 
   return false;
 }

=== modified file 'storage/ndb/src/kernel/blocks/backup/Backup.cpp'
--- a/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2010-10-04 11:07:50 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2010-10-04 11:13:22 +0000
@@ -4458,7 +4458,7 @@ Backup::checkScan(Signal* signal, Backup
     op.closeScan();
     ScanFragNextReq * req = (ScanFragNextReq *)signal->getDataPtrSend();
     req->senderData = filePtr.i;
-    req->closeFlag = 1;
+    req->requestInfo = ScanFragNextReq::ZCLOSE;
     req->transId1 = 0;
     req->transId2 = (BACKUP << 20) + (getOwnNodeId() << 8);
     sendSignal(lqhRef, GSN_SCAN_NEXTREQ, signal, 
@@ -4471,7 +4471,7 @@ Backup::checkScan(Signal* signal, Backup
     
     ScanFragNextReq * req = (ScanFragNextReq *)signal->getDataPtrSend();
     req->senderData = filePtr.i;
-    req->closeFlag = 0;
+    req->requestInfo = 0;
     req->transId1 = 0;
     req->transId2 = (BACKUP << 20) + (getOwnNodeId() << 8);
     req->batch_size_rows= 16;

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2010-09-27 08:52:07 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2010-10-04 11:13:22 +0000
@@ -9261,7 +9261,7 @@ void Dblqh::execSCAN_NEXTREQ(Signal* sig
     jam();
     DEBUG(senderData << 
 	  " Received SCAN_NEXTREQ in LQH with close flag when closed");
-    ndbrequire(nextReq->closeFlag == ZTRUE);
+    ndbrequire(nextReq->requestInfo == ScanFragNextReq::ZCLOSE);
     return;
   }
 
@@ -9315,7 +9315,8 @@ void Dblqh::execSCAN_NEXTREQ(Signal* sig
    * continue execution else set flags and wait until the scan 
    * completes itself
    * ------------------------------------------------------------------ */
-  if (nextReq->closeFlag == ZTRUE){
+  if (nextReq->requestInfo == ScanFragNextReq::ZCLOSE)
+  {
     jam();
     if(ERROR_INSERTED(5034)){
       CLEAR_ERROR_INSERT_VALUE;

=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2010-10-04 11:07:50 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2010-10-04 11:13:22 +0000
@@ -11089,7 +11089,7 @@ void Dbtc::execSCAN_NEXTREQ(Signal* sign
   }
 
   ScanFragNextReq tmp;
-  tmp.closeFlag = ZFALSE;
+  tmp.requestInfo = 0;
   tmp.transId1 = apiConnectptr.p->transid[0];
   tmp.transId2 = apiConnectptr.p->transid[1];
   tmp.batch_size_rows = scanP->batch_size_rows;
@@ -11175,7 +11175,7 @@ Dbtc::close_scan_req(Signal* signal, Sca
    */
   
   ScanFragNextReq * nextReq = (ScanFragNextReq*)&signal->theData[0];
-  nextReq->closeFlag = ZTRUE;
+  nextReq->requestInfo = ScanFragNextReq::ZCLOSE;
   nextReq->transId1 = apiConnectptr.p->transid[0];
   nextReq->transId2 = apiConnectptr.p->transid[1];
   

=== modified file 'storage/ndb/src/kernel/blocks/suma/Suma.cpp'
--- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2010-10-04 11:07:50 +0000
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2010-10-04 11:13:22 +0000
@@ -2643,7 +2643,7 @@ Suma::execSUB_SYNC_CONTINUE_CONF(Signal*
 
   ScanFragNextReq * req = (ScanFragNextReq *)signal->getDataPtrSend();
   req->senderData = syncPtrI;
-  req->closeFlag = 0;
+  req->requestInfo = 0;
   req->transId1 = 0;
   req->transId2 = (SUMA << 20) + (getOwnNodeId() << 8);
   req->batch_size_rows = 16;


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