diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-03-10 12:21:17 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-03-10 12:21:17 +0100 |
| commit | 85e8aee47d2e1cc58857148293f84ccd7e2ec620 (patch) | |
| tree | 078efdcf3dfa65b84a05353645276dc1d3b07bc5 /storage/connect/tabfmt.cpp | |
| parent | 126bb34513f34eba97598d2357bfc1c2fbf594b4 (diff) | |
| download | mariadb-git-85e8aee47d2e1cc58857148293f84ccd7e2ec620.tar.gz | |
- Temporary
modified:
storage/connect/catalog.h
storage/connect/colblk.cpp
storage/connect/colblk.h
storage/connect/connect.cc
storage/connect/filamap.cpp
storage/connect/filamfix.cpp
storage/connect/filamfix.h
storage/connect/filamtxt.cpp
storage/connect/filamvct.cpp
storage/connect/filamzip.cpp
storage/connect/filamzip.h
storage/connect/ha_connect.cc
storage/connect/ha_connect.h
storage/connect/plgdbsem.h
storage/connect/plgdbutl.cpp
storage/connect/reldef.cpp
storage/connect/reldef.h
storage/connect/tabdos.cpp
storage/connect/tabdos.h
storage/connect/tabfix.cpp
storage/connect/tabfix.h
storage/connect/tabfmt.cpp
storage/connect/tabfmt.h
storage/connect/table.cpp
storage/connect/tabmac.h
storage/connect/tabmul.h
storage/connect/tabmysql.cpp
storage/connect/tabodbc.cpp
storage/connect/tabsys.cpp
storage/connect/tabsys.h
storage/connect/tabtbl.cpp
storage/connect/tabtbl.h
storage/connect/tabvct.cpp
storage/connect/tabvct.h
storage/connect/tabwmi.cpp
storage/connect/tabwmi.h
storage/connect/tabxml.cpp
storage/connect/tabxml.h
storage/connect/valblk.cpp
storage/connect/valblk.h
storage/connect/value.cpp
storage/connect/value.h
storage/connect/xobject.cpp
storage/connect/xobject.h
storage/connect/xtable.h
Diffstat (limited to 'storage/connect/tabfmt.cpp')
| -rw-r--r-- | storage/connect/tabfmt.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/connect/tabfmt.cpp b/storage/connect/tabfmt.cpp index 9a121b9ab9a..18ecaae430a 100644 --- a/storage/connect/tabfmt.cpp +++ b/storage/connect/tabfmt.cpp @@ -459,9 +459,12 @@ PTDB CSVDEF::GetTable(PGLOBAL g, MODE mode) if (Compressed == 1) txfp = new(g) ZIPFAM(this); else { +#if defined(BLK_INDX) + txfp = new(g) ZLBFAM(this); +#else // !BLK_INDX strcpy(g->Message, "Compress 2 not supported yet"); -// txfp = new(g) ZLBFAM(defp); return NULL; +#endif // !BLK_INDX } // endelse #else // !ZIP_SUPPORT strcpy(g->Message, "Compress not supported"); @@ -1272,6 +1275,7 @@ CSVCOL::CSVCOL(CSVCOL *col1, PTDB tdbp) : DOSCOL(col1, tdbp) Fldnum = col1->Fldnum; } // end of CSVCOL copy constructor +#if defined(BLK_INDX) /***********************************************************************/ /* VarSize: This function tells UpdateDB whether or not the block */ /* optimization file must be redone if this column is updated, even */ @@ -1290,6 +1294,7 @@ bool CSVCOL::VarSize(void) return false; } // end VarSize +#endif // BLK_INDX /***********************************************************************/ /* ReadColumn: call DOSCOL::ReadColumn after having set the offet */ |