Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
e91fb70f
Commit
e91fb70f
authored
Jun 17, 2019
by
Aleksey Midenkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-19785 Storage CONNECT compilation error: unknown type name 'UNZFAM'
Another fail fix: undefined reference to `ZipLoadFile`
parent
41f4f6be
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
storage/connect/ha_connect.cc
storage/connect/ha_connect.cc
+2
-0
storage/connect/tabfmt.cpp
storage/connect/tabfmt.cpp
+2
-0
No files found.
storage/connect/ha_connect.cc
View file @
e91fb70f
...
...
@@ -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
)
{
...
...
storage/connect/tabfmt.cpp
View file @
e91fb70f
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment