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
efe80675
Commit
efe80675
authored
7 years ago
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Remove warning on not used tabtyp variable in connect_assisted_discovery
modified: storage/connect/ha_connect.cc
parent
79c1df4c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
storage/connect/ha_connect.cc
storage/connect/ha_connect.cc
+5
-4
No files found.
storage/connect/ha_connect.cc
View file @
efe80675
...
...
@@ -174,7 +174,7 @@
#define JSONMAX 10 // JSON Default max grp size
extern
"C"
{
char
version
[]
=
"Version 1.06.0006
January 31
, 2018"
;
char
version
[]
=
"Version 1.06.0006
February 02
, 2018"
;
#if defined(__WIN__)
char
compver
[]
=
"Version 1.06.0006 "
__DATE__
" "
__TIME__
;
char
slash
=
'\\'
;
...
...
@@ -5431,7 +5431,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
#endif // __WIN__
//int hdr, mxe;
int
port
=
0
,
mxr
=
0
,
rc
=
0
,
mul
=
0
,
lrecl
=
0
;
PCSZ
tabtyp
=
NULL
;
//
PCSZ tabtyp = NULL;
#if defined(ODBC_SUPPORT)
POPARM
sop
=
NULL
;
PCSZ
ucnc
=
NULL
;
...
...
@@ -5495,7 +5495,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
#endif // __WIN__
port
=
atoi
(
GetListOption
(
g
,
"port"
,
topt
->
oplist
,
"0"
));
#if defined(ODBC_SUPPORT)
tabtyp
=
GetListOption
(
g
,
"Tabtype"
,
topt
->
oplist
,
NULL
);
//
tabtyp = GetListOption(g, "Tabtype", topt->oplist, NULL);
mxr
=
atoi
(
GetListOption
(
g
,
"maxres"
,
topt
->
oplist
,
"0"
));
cto
=
atoi
(
GetListOption
(
g
,
"ConnectTimeout"
,
topt
->
oplist
,
"-1"
));
qto
=
atoi
(
GetListOption
(
g
,
"QueryTimeout"
,
topt
->
oplist
,
"-1"
));
...
...
@@ -5808,7 +5808,8 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
break
;
case
FNC_TABLE
:
qrp
=
JDBCTables
(
g
,
shm
,
tab
,
tabtyp
,
mxr
,
true
,
sjp
);
// qrp = JDBCTables(g, shm, tab, tabtyp, mxr, true, sjp);
qrp
=
JDBCTables
(
g
,
shm
,
tab
,
NULL
,
mxr
,
true
,
sjp
);
break
;
#if 0
case FNC_DSN:
...
...
This diff is collapsed.
Click to expand it.
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