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
6f14531b
Commit
6f14531b
authored
Jul 26, 2015
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CONNECT: compiler warnings
and don't check table privileges in external_lock(F_UNLCK).
parent
00967e11
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
storage/connect/ha_connect.cc
storage/connect/ha_connect.cc
+6
-6
No files found.
storage/connect/ha_connect.cc
View file @
6f14531b
...
@@ -1114,7 +1114,7 @@ int GetIntegerTableOption(PGLOBAL g, PTOS options, char *opname, int idef)
...
@@ -1114,7 +1114,7 @@ int GetIntegerTableOption(PGLOBAL g, PTOS options, char *opname, int idef)
else
if
(
!
stricmp
(
opname
,
"Compressed"
))
else
if
(
!
stricmp
(
opname
,
"Compressed"
))
opval
=
(
options
->
compressed
);
opval
=
(
options
->
compressed
);
if
(
opval
==
NO_IVAL
)
{
if
(
opval
==
(
ulonglong
)
NO_IVAL
)
{
char
*
pv
;
char
*
pv
;
if
((
pv
=
GetListOption
(
g
,
opname
,
options
->
oplist
)))
if
((
pv
=
GetListOption
(
g
,
opname
,
options
->
oplist
)))
...
@@ -4427,15 +4427,16 @@ int ha_connect::external_lock(THD *thd, int lock_type)
...
@@ -4427,15 +4427,16 @@ int ha_connect::external_lock(THD *thd, int lock_type)
xmod
=
MODE_ANY
;
// For info commands
xmod
=
MODE_ANY
;
// For info commands
DBUG_RETURN
(
rc
);
DBUG_RETURN
(
rc
);
}
// endif MODE_ANY
}
// endif MODE_ANY
else
DBUG_ASSERT
(
table
&&
table
->
s
);
if
(
check_privileges
(
thd
,
options
,
table
->
s
->
db
.
str
))
{
if
(
check_privileges
(
thd
,
options
,
table
->
s
->
db
.
str
))
{
strcpy
(
g
->
Message
,
"This operation requires the FILE privilege"
);
strcpy
(
g
->
Message
,
"This operation requires the FILE privilege"
);
htrc
(
"%s
\n
"
,
g
->
Message
);
htrc
(
"%s
\n
"
,
g
->
Message
);
DBUG_RETURN
(
HA_ERR_INTERNAL_ERROR
);
DBUG_RETURN
(
HA_ERR_INTERNAL_ERROR
);
}
// endif check_privileges
}
// endif check_privileges
DBUG_ASSERT
(
table
&&
table
->
s
);
// Table mode depends on the query type
// Table mode depends on the query type
newmode
=
CheckMode
(
g
,
thd
,
newmode
,
&
xcheck
,
&
cras
);
newmode
=
CheckMode
(
g
,
thd
,
newmode
,
&
xcheck
,
&
cras
);
...
@@ -5028,7 +5029,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
...
@@ -5028,7 +5029,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
char
*
nsp
=
NULL
,
*
cls
=
NULL
;
char
*
nsp
=
NULL
,
*
cls
=
NULL
;
#endif // __WIN__
#endif // __WIN__
int
port
=
0
,
hdr
=
0
,
mxr
=
0
,
mxe
=
0
,
rc
=
0
;
int
port
=
0
,
hdr
=
0
,
mxr
=
0
,
mxe
=
0
,
rc
=
0
;
int
cop
__attribute__
((
unused
))
=
0
,
lrecl
=
0
;
int
cop
__attribute__
((
unused
))
=
0
;
#if defined(ODBC_SUPPORT)
#if defined(ODBC_SUPPORT)
POPARM
sop
=
NULL
;
POPARM
sop
=
NULL
;
char
*
ucnc
=
NULL
;
char
*
ucnc
=
NULL
;
...
@@ -5074,7 +5075,6 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
...
@@ -5074,7 +5075,6 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
hdr
=
(
int
)
topt
->
header
;
hdr
=
(
int
)
topt
->
header
;
tbl
=
topt
->
tablist
;
tbl
=
topt
->
tablist
;
col
=
topt
->
colist
;
col
=
topt
->
colist
;
lrecl
=
(
int
)
topt
->
lrecl
;
if
(
topt
->
oplist
)
{
if
(
topt
->
oplist
)
{
host
=
GetListOption
(
g
,
"host"
,
topt
->
oplist
,
"localhost"
);
host
=
GetListOption
(
g
,
"host"
,
topt
->
oplist
,
"localhost"
);
...
...
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