1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Another fail fix:

undefined reference to `ZipLoadFile`
This commit is contained in:
Aleksey Midenkov 2019-06-17 11:44:53 +03:00
parent 41f4f6bea8
commit e91fb70f99
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/connect/ha_connect.cc
View File

@ -6681,6 +6681,7 @@ int ha_connect::create(const char *name, TABLE *table_arg,
if (trace(1)) if (trace(1))
htrc("xchk=%p createas=%d\n", g->Xchk, g->Createas); htrc("xchk=%p createas=%d\n", g->Xchk, g->Createas);
#if defined(ZIP_SUPPORT)
if (options->zipped) { if (options->zipped) {
// Check whether the zip entry must be made from a file // Check whether the zip entry must be made from a file
PCSZ fn = GetListOption(g, "Load", options->oplist, NULL); 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 fn
} // endif zipped } // endif zipped
#endif // ZIP_SUPPORT
// To check whether indexes have to be made or remade // To check whether indexes have to be made or remade
if (!g->Xchk) { if (!g->Xchk) {

2
storage/connect/tabfmt.cpp
View File

@ -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", htrc("File %s Sep=%c Qot=%c Header=%d maxerr=%d\n",
SVP(tdp->Fn), tdp->Sep, tdp->Qot, tdp->Header, tdp->Maxerr); SVP(tdp->Fn), tdp->Sep, tdp->Qot, tdp->Header, tdp->Maxerr);
#if defined(ZIP_SUPPORT)
if (tdp->Zipped) if (tdp->Zipped)
tcvp = new(g)TDBCSV(tdp, new(g)UNZFAM(tdp)); tcvp = new(g)TDBCSV(tdp, new(g)UNZFAM(tdp));
else else
#endif
tcvp = new(g) TDBCSV(tdp, new(g) DOSFAM(tdp)); tcvp = new(g) TDBCSV(tdp, new(g) DOSFAM(tdp));
tcvp->SetMode(MODE_READ); tcvp->SetMode(MODE_READ);