Skip to content
Permalink
Browse files

MDEV-19785 Storage CONNECT compilation error: unknown type name 'UNZFAM'

Another fail fix:

undefined reference to `ZipLoadFile`
  • Loading branch information...
midenok committed Jun 17, 2019
1 parent 9d6b601 commit 1bb57e59a1d646c42c3de2650b6a00cbb651503d
Showing with 4 additions and 0 deletions.
  1. +2 −0 storage/connect/ha_connect.cc
  2. +2 −0 storage/connect/tabfmt.cpp
@@ -6679,6 +6679,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);
@@ -6708,6 +6709,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) {
@@ -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);

0 comments on commit 1bb57e5

Please sign in to comment.
You can’t perform that action at this time.