From e91fb70f99d50a4f4ddbb484f6def10f91f66ee2 Mon Sep 17 00:00:00 2001 From: Aleksey Midenkov Date: Mon, 17 Jun 2019 11:44:53 +0300 Subject: [PATCH] MDEV-19785 Storage CONNECT compilation error: unknown type name 'UNZFAM' Another fail fix: undefined reference to `ZipLoadFile` --- storage/connect/ha_connect.cc | 2 ++ storage/connect/tabfmt.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index d2d82280764..20b0b72bd5e 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -6681,6 +6681,7 @@ int ha_connect::create(const char *name, TABLE *table_arg, if (trace(1)) htrc("xchk=%p createas=%d\n", g->Xchk, g->Createas); +#if defined(ZIP_SUPPORT) if (options->zipped) { // Check whether the zip entry must be made from a file PCSZ fn = GetListOption(g, "Load", options->oplist, NULL); @@ -6710,6 +6711,7 @@ int ha_connect::create(const char *name, TABLE *table_arg, } // endif fn } // endif zipped +#endif // ZIP_SUPPORT // To check whether indexes have to be made or remade if (!g->Xchk) { diff --git a/storage/connect/tabfmt.cpp b/storage/connect/tabfmt.cpp index 02720a3089a..23cca6f6837 100644 --- a/storage/connect/tabfmt.cpp +++ b/storage/connect/tabfmt.cpp @@ -189,9 +189,11 @@ PQRYRES CSVColumns(PGLOBAL g, PCSZ dp, PTOS topt, bool info) htrc("File %s Sep=%c Qot=%c Header=%d maxerr=%d\n", SVP(tdp->Fn), tdp->Sep, tdp->Qot, tdp->Header, tdp->Maxerr); +#if defined(ZIP_SUPPORT) if (tdp->Zipped) tcvp = new(g)TDBCSV(tdp, new(g)UNZFAM(tdp)); else +#endif tcvp = new(g) TDBCSV(tdp, new(g) DOSFAM(tdp)); tcvp->SetMode(MODE_READ);