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
5c5d60b8
Commit
5c5d60b8
authored
Jun 25, 2021
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compile error in value.h and remove unused variables in ha_connect.cc
parent
330b32eb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
storage/connect/ha_connect.cc
storage/connect/ha_connect.cc
+1
-4
storage/connect/value.h
storage/connect/value.h
+1
-1
No files found.
storage/connect/ha_connect.cc
View file @
5c5d60b8
...
...
@@ -4377,7 +4377,6 @@ int ha_connect::info(uint flag)
// tdbp must be available to get updated info
if
(
xp
->
CheckQuery
(
valid_query_id
)
||
!
tdbp
)
{
PDBUSER
dup
=
PlgGetUser
(
g
);
PCATLG
cat
=
(
dup
)
?
dup
->
Catalog
:
NULL
;
if
(
xmod
==
MODE_ANY
||
xmod
==
MODE_ALTER
)
{
// Pure info, not a query
...
...
@@ -5615,7 +5614,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
PCSZ
nsp
=
NULL
,
cls
=
NULL
;
#endif // _WIN32
//int hdr, mxe;
int
port
=
0
,
mxr
=
0
,
rc
=
0
,
mul
=
0
,
lrecl
=
0
;
int
port
=
0
,
mxr
=
0
,
rc
=
0
,
mul
=
0
;
//PCSZ tabtyp= NULL;
#if defined(ODBC_SUPPORT)
POPARM
sop
=
NULL
;
...
...
@@ -5638,8 +5637,6 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
if
(
!
g
)
return
HA_ERR_INTERNAL_ERROR
;
PDBUSER
dup
=
PlgGetUser
(
g
);
PCATLG
cat
=
(
dup
)
?
dup
->
Catalog
:
NULL
;
PTOS
topt
=
table_s
->
option_struct
;
char
buf
[
1024
];
String
sql
(
buf
,
sizeof
(
buf
),
system_charset_info
);
...
...
storage/connect/value.h
View file @
5c5d60b8
...
...
@@ -412,7 +412,7 @@ class DllExport DTVAL : public TYPVAL<int> {
// Constructors
DTVAL
(
PGLOBAL
g
,
int
n
,
int
p
,
PCSZ
fmt
);
DTVAL
(
int
n
);
using
TYPVAL
::
SetValue
;
using
TYPVAL
<
int
>
::
SetValue
;
// Implementation
virtual
bool
SetValue_pval
(
PVAL
valp
,
bool
chktype
);
...
...
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