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
64af2849
Commit
64af2849
authored
Mar 30, 2005
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
parents
bb713b13
2a297353
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
sql/sql_parse.cc
sql/sql_parse.cc
+5
-4
No files found.
sql/sql_parse.cc
View file @
64af2849
...
...
@@ -2704,6 +2704,7 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv,
DBUG_PRINT
(
"enter"
,(
"want_access: %lu master_access: %lu"
,
want_access
,
thd
->
master_access
));
ulong
db_access
,
dummy
;
bool
db_is_pattern
=
test
(
want_access
&
GRANT_ACL
);
if
(
save_priv
)
*
save_priv
=
0
;
else
...
...
@@ -2725,9 +2726,9 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv,
*/
db_access
=
thd
->
db_access
;
if
(
!
(
thd
->
master_access
&
SELECT_ACL
)
&&
(
db
&&
(
!
thd
->
db
||
strcmp
(
db
,
thd
->
db
))))
(
db
&&
(
!
thd
->
db
||
db_is_pattern
||
strcmp
(
db
,
thd
->
db
))))
db_access
=
acl_get
(
thd
->
host
,
thd
->
ip
,
(
char
*
)
&
thd
->
remote
.
sin_addr
,
thd
->
priv_user
,
db
,
test
(
want_access
&
GRANT_ACL
)
);
thd
->
priv_user
,
db
,
db_is_pattern
);
*
save_priv
=
thd
->
master_access
|
db_access
;
DBUG_RETURN
(
FALSE
);
}
...
...
@@ -2745,9 +2746,9 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv,
if
(
db
==
any_db
)
DBUG_RETURN
(
FALSE
);
// Allow select on anything
if
(
db
&&
(
!
thd
->
db
||
strcmp
(
db
,
thd
->
db
)))
if
(
db
&&
(
!
thd
->
db
||
db_is_pattern
||
strcmp
(
db
,
thd
->
db
)))
db_access
=
acl_get
(
thd
->
host
,
thd
->
ip
,
(
char
*
)
&
thd
->
remote
.
sin_addr
,
thd
->
priv_user
,
db
,
test
(
want_access
&
GRANT_ACL
)
);
thd
->
priv_user
,
db
,
db_is_pattern
);
else
db_access
=
thd
->
db_access
;
// Remove SHOW attribute and access rights we already have
...
...
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