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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
d5c97122
Commit
d5c97122
authored
Oct 27, 2013
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
post-review cleanup
parent
e46eea86
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
65 additions
and
64 deletions
+65
-64
mysql-test/suite/roles/drop_current_user-5176.test
mysql-test/suite/roles/drop_current_user-5176.test
+1
-0
sql/log_event.cc
sql/log_event.cc
+1
-1
sql/sql_acl.cc
sql/sql_acl.cc
+59
-61
sql/sql_parse.cc
sql/sql_parse.cc
+0
-2
sql/sql_view.cc
sql/sql_view.cc
+4
-0
No files found.
mysql-test/suite/roles/drop_current_user-5176.test
View file @
d5c97122
#
#
# MDEV-5176 Server crashes in fill_schema_applicable_roles on select from APPLICABLE_ROLES after a suicide
# MDEV-5176 Server crashes in fill_schema_applicable_roles on select from APPLICABLE_ROLES after a suicide
#
#
--
source
include
/
not_embedded
.
inc
grant
create
user
on
*.*
to
foo
@
localhost
;
grant
create
user
on
*.*
to
foo
@
localhost
;
--
connect
(
foo
,
localhost
,
foo
,,)
--
connect
(
foo
,
localhost
,
foo
,,)
...
...
sql/log_event.cc
View file @
d5c97122
...
@@ -2866,7 +2866,7 @@ bool Query_log_event::write(IO_CACHE* file)
...
@@ -2866,7 +2866,7 @@ bool Query_log_event::write(IO_CACHE* file)
else
else
{
{
user
.
str
=
ctx
->
priv_role
;
user
.
str
=
ctx
->
priv_role
;
host
=
null_lex_str
;
// XXX FIXME or empty_lex_str ?
host
=
empty_lex_str
;
}
}
user
.
length
=
strlen
(
user
.
str
);
user
.
length
=
strlen
(
user
.
str
);
}
}
...
...
sql/sql_acl.cc
View file @
d5c97122
This diff is collapsed.
Click to expand it.
sql/sql_parse.cc
View file @
d5c97122
...
@@ -3908,8 +3908,6 @@ end_with_restore_list:
...
@@ -3908,8 +3908,6 @@ end_with_restore_list:
case
SQLCOM_REVOKE_ROLE
:
case
SQLCOM_REVOKE_ROLE
:
case
SQLCOM_GRANT_ROLE
:
case
SQLCOM_GRANT_ROLE
:
{
{
/* TODO access check */
if
(
!
(
res
=
mysql_grant_role
(
thd
,
lex
->
users_list
,
if
(
!
(
res
=
mysql_grant_role
(
thd
,
lex
->
users_list
,
lex
->
sql_command
!=
SQLCOM_GRANT_ROLE
)))
lex
->
sql_command
!=
SQLCOM_GRANT_ROLE
)))
my_ok
(
thd
);
my_ok
(
thd
);
...
...
sql/sql_view.cc
View file @
d5c97122
...
@@ -822,6 +822,10 @@ static int mysql_register_view(THD *thd, TABLE_LIST *view,
...
@@ -822,6 +822,10 @@ static int mysql_register_view(THD *thd, TABLE_LIST *view,
goto
err
;
goto
err
;
}
}
/*
version 1 - before 10.0.5
version 2 - empty definer_host means a role
*/
view
->
file_version
=
2
;
view
->
file_version
=
2
;
view
->
calc_md5
(
md5
);
view
->
calc_md5
(
md5
);
if
(
!
(
view
->
md5
.
str
=
(
char
*
)
thd
->
memdup
(
md5
,
32
)))
if
(
!
(
view
->
md5
.
str
=
(
char
*
)
thd
->
memdup
(
md5
,
32
)))
...
...
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