diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-03-20 12:05:47 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-03-20 12:05:47 +0100 |
| commit | 7b400a088d049661b9a4dded385ac78923bb0017 (patch) | |
| tree | bb3ee7bac4454f66ec6f38cf6683f24bc6c065d4 /storage/connect/filamfix.cpp | |
| parent | d67ad26b33ea16a3b59215ef967bdd9b89345e04 (diff) | |
| parent | e5729127b8a50a0e553fd8b87b2683e4a684dfcc (diff) | |
| download | mariadb-git-7b400a088d049661b9a4dded385ac78923bb0017.tar.gz | |
- 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
Diffstat (limited to 'storage/connect/filamfix.cpp')
| -rw-r--r-- | storage/connect/filamfix.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/storage/connect/filamfix.cpp b/storage/connect/filamfix.cpp index 295c281a478..daf133d4203 100644 --- a/storage/connect/filamfix.cpp +++ b/storage/connect/filamfix.cpp @@ -168,13 +168,10 @@ int FIXFAM::ReadBuffer(PGLOBAL g) CurNum = 0; Tdbp->SetLine(To_Buf); -#if defined(BLK_INDX) next: -#endif // BLK_INDX if (++CurBlk >= Block) return RC_EF; -#if defined(BLK_INDX) /*****************************************************************/ /* Before reading a new block, check whether block indexing */ /* can be done, as well as for join as for local filtering. */ @@ -185,7 +182,6 @@ int FIXFAM::ReadBuffer(PGLOBAL g) case RC_NF: goto next; } // endswitch rc -#endif // BLK_INDX } // endif's if (OldBlk == CurBlk) { @@ -1043,13 +1039,10 @@ int BGXFAM::ReadBuffer(PGLOBAL g) CurNum = 0; Tdbp->SetLine(To_Buf); -#if defined(BLK_INDX) next: -#endif // BLK_INDX if (++CurBlk >= Block) return RC_EF; -#if defined(BLK_INDX) /*****************************************************************/ /* Before reading a new block, check whether block optimization */ /* can be done, as well as for join as for local filtering. */ @@ -1060,7 +1053,7 @@ int BGXFAM::ReadBuffer(PGLOBAL g) case RC_NF: goto next; } // endswitch rc -#endif // BLK_INDX + } // endif's if (OldBlk == CurBlk) { |