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

Another fail fix: undefined reference to `ZipLoadFile`
MariaDB · Jul 8, 2019 · 0fe212a · 0fe212a
1 parent 9abdf11
commit 0fe212a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
@@ -6683,6 +6683,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);
@@ -6712,6 +6713,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
@@ -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);