bzr commit into mysql-5.1-telco-7.0-spj branch (ole.john.aske:3134)

[Ole John Aske]

#At file:///home/oa136780/mysql/mysql-5.1-telco-7.0-spj/ based on revid:ole.john.aske@stripped

 3134 Ole John Aske	2010-04-08
      Removed some 'TODO' disabled code which already has been handled in previous commits

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2010-03-10 13:28:40 +0000
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2010-04-08 13:32:24 +0000
@@ -1851,17 +1851,6 @@ Dbspj::scanFrag_build(Build_context& ctx
     ScanFragReq::setNoDiskFlag(requestInfo, 
                                (treeBits & DABits::NI_LINKED_DISK) == 0 &&
                                (paramBits & DABits::PI_DISK_ATTR) == 0);
-
-#if 0
-    static void setDescendingFlag(Uint32 & requestInfo, Uint32 descending);
-    static void setTupScanFlag(Uint32 & requestInfo, Uint32 tupScan);
-    static void setAttrLen(Uint32 & requestInfo, Uint32 attrLen);
-    static void setScanPrio(Uint32& requestInfo, Uint32 prio);
-    static void setLcpScanFlag(Uint32 & requestInfo, Uint32 val);
-
-    static void setReorgFlag(Uint32 & requestInfo, Uint32 val);
-    static Uint32 getReorgFlag(const Uint32 & requestInfo);
-#endif
     dst->requestInfo = requestInfo;
 
     err = DbspjErr::InvalidTreeNodeSpecification;
@@ -1945,15 +1934,8 @@ Dbspj::scanFrag_start(Signal* signal,
   ndbassert(ScanFragReq::getReadCommittedFlag(requestInfo) == 1);
   ndbassert(ScanFragReq::getLcpScanFlag(requestInfo) == 0);
   //ScanFragReq::getAttrLen(requestInfo); // ignore
-
-#if TODO
   ndbassert(ScanFragReq::getReorgFlag(requestInfo) == 0);
-  ndbassert(ScanFragReq::getDescendingFlag(requestInfo) == 0);
-  ndbassert(ScanFragReq::getTupScanFlag(requestInfo) == 0);
-  ndbassert(ScanFragReq::getScanPrio(requestInfo) == 1);
-#endif
 
-  ndbassert(ScanFragReq::getReorgFlag(requestInfo) == 0);
   Uint32 tupScanFlag = ScanFragReq::getTupScanFlag(requestInfo);
   Uint32 rangeScanFlag = ScanFragReq::getRangeScanFlag(requestInfo);
   Uint32 descendingFlag = ScanFragReq::getDescendingFlag(requestInfo);


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