- MRR + Block Indexing

modified:
  storage/connect/array.h
  storage/connect/catalog.h
  storage/connect/colblk.cpp
  storage/connect/colblk.h
  storage/connect/connect.cc
  storage/connect/connect.h
  storage/connect/domdoc.h
  storage/connect/filamap.cpp
  storage/connect/filamap.h
  storage/connect/filamdbf.h
  storage/connect/filamfix.cpp
  storage/connect/filamfix.h
  storage/connect/filamtxt.cpp
  storage/connect/filamtxt.h
  storage/connect/filamvct.cpp
  storage/connect/filamvct.h
  storage/connect/filamzip.cpp
  storage/connect/filamzip.h
  storage/connect/filter.cpp
  storage/connect/filter.h
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/myconn.h
  storage/connect/plgcnx.h
  storage/connect/plgdbsem.h
  storage/connect/plgdbutl.cpp
  storage/connect/plugutil.c
  storage/connect/preparse.h
  storage/connect/reldef.cpp
  storage/connect/reldef.h
  storage/connect/tabcol.h
  storage/connect/tabdos.cpp
  storage/connect/tabdos.h
  storage/connect/tabfix.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabfmt.h
  storage/connect/table.cpp
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
  storage/connect/taboccur.h
  storage/connect/tabodbc.h
  storage/connect/tabsys.h
  storage/connect/tabtbl.h
  storage/connect/tabutil.h
  storage/connect/tabvct.cpp
  storage/connect/tabvct.h
  storage/connect/tabwmi.h
  storage/connect/tabxml.h
  storage/connect/user_connect.cc
  storage/connect/user_connect.h
  storage/connect/valblk.cpp
  storage/connect/valblk.h
  storage/connect/value.cpp
  storage/connect/value.h
  storage/connect/xindex.cpp
  storage/connect/xindex.h
  storage/connect/xobject.cpp
  storage/connect/xobject.h
  storage/connect/xtable.h

1 files changed, 2 insertions, 13 deletions

diff --git a/storage/connect/tabfix.cpp b/storage/connect/tabfix.cpp
index cb95cebe7d1..aa6a44fc791 100644
--- a/storage/connect/tabfix.cpp
+++ b/storage/connect/tabfix.cpp
@@ -45,10 +45,8 @@
 #include "filamfix.h"
 #include "filamdbf.h"
 #include "tabfix.h"      // TDBFIX, FIXCOL classes declares
-#if defined(BLK_INDX)
 #include "array.h"
 #include "blkfil.h"
-#endif   // BLK_INDX
 
 /***********************************************************************/
 /*  DB static variables.                                               */
@@ -129,7 +127,6 @@ PCOL TDBFIX::MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n)
 /***********************************************************************/
 int TDBFIX::ResetTableOpt(PGLOBAL g, bool dop, bool dox)
   {
-#if defined(BLK_INDX)
   int prc, rc = RC_OK;
 
   To_Filter = NULL;                     // Disable filtering
@@ -169,10 +166,6 @@ int TDBFIX::ResetTableOpt(PGLOBAL g, bool dop, bool dox)
     } // endif dox
 
   return rc;
-#else   // !BLK_INDX    
-  RestoreNrec();                        // May have been modified
-  return TDBDOS::ResetTableOpt(g, dop, dox);
-#endif  // !BLK_INDX
   } // end of ResetTableOpt
 
 /***********************************************************************/
@@ -211,14 +204,14 @@ int TDBFIX::GetMaxSize(PGLOBAL g)
   {
   if (MaxSize < 0) {
     MaxSize = Cardinality(g);
-#if defined(BLK_INDX)
+
     if (MaxSize > 0 && (To_BlkFil = InitBlockFilter(g, To_Filter))
                     && !To_BlkFil->Correlated()) {
       // Use BlockTest to reduce the estimated size
       MaxSize = Txfp->MaxBlkSize(g, MaxSize);
       ResetBlockFilter(g);
       } // endif To_BlkFil
-#endif   // BLK_INDX
+
     } // endif MaxSize
 
   return MaxSize;
@@ -301,9 +294,7 @@ bool TDBFIX::OpenDB(PGLOBAL g)
     else
       Txfp->Rewind();       // see comment in Work.log
 
-#if defined(BLK_INDX)
     ResetBlockFilter(g);
-#endif   // BLK_INDX
     return false;
     } // endif use
 
@@ -335,12 +326,10 @@ bool TDBFIX::OpenDB(PGLOBAL g)
   /*********************************************************************/
   To_Line = Txfp->GetBuf();                       // For WriteDB
 
-#if defined(BLK_INDX)
   /*********************************************************************/
   /*  Allocate the block filter tree if evaluation is possible.        */
   /*********************************************************************/
   To_BlkFil = InitBlockFilter(g, To_Filter);
-#endif   // BLK_INDX
 
   if (trace)
     htrc("OpenDos: R%hd mode=%d\n", Tdb_No, Mode);