Skip to content

Commit e91fb70

Browse files
committed
MDEV-19785 Storage CONNECT compilation error: unknown type name 'UNZFAM'
Another fail fix: undefined reference to `ZipLoadFile`
1 parent 41f4f6b commit e91fb70

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

storage/connect/ha_connect.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6681,6 +6681,7 @@ int ha_connect::create(const char *name, TABLE *table_arg,
66816681
if (trace(1))
66826682
htrc("xchk=%p createas=%d\n", g->Xchk, g->Createas);
66836683

6684+
#if defined(ZIP_SUPPORT)
66846685
if (options->zipped) {
66856686
// Check whether the zip entry must be made from a file
66866687
PCSZ fn = GetListOption(g, "Load", options->oplist, NULL);
@@ -6710,6 +6711,7 @@ int ha_connect::create(const char *name, TABLE *table_arg,
67106711
} // endif fn
67116712

67126713
} // endif zipped
6714+
#endif // ZIP_SUPPORT
67136715

67146716
// To check whether indexes have to be made or remade
67156717
if (!g->Xchk) {

storage/connect/tabfmt.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,11 @@ PQRYRES CSVColumns(PGLOBAL g, PCSZ dp, PTOS topt, bool info)
189189
htrc("File %s Sep=%c Qot=%c Header=%d maxerr=%d\n",
190190
SVP(tdp->Fn), tdp->Sep, tdp->Qot, tdp->Header, tdp->Maxerr);
191191

192+
#if defined(ZIP_SUPPORT)
192193
if (tdp->Zipped)
193194
tcvp = new(g)TDBCSV(tdp, new(g)UNZFAM(tdp));
194195
else
196+
#endif
195197
tcvp = new(g) TDBCSV(tdp, new(g) DOSFAM(tdp));
196198

197199
tcvp->SetMode(MODE_READ);

0 commit comments

Comments
 (0)