1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-22966 Server crashes or hangs with SET ROLE when started with skip-grant-tables

Browse Source
This commit is contained in:
Sergei Golubchik 2021-01-09 17:00:04 +01:00
parent 69f1adaa55
commit fc0d9a470c
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/skip_grants.result
View File

@ -99,3 +99,11 @@ Acl_users 0
#
# End of 10.1 tests
#
#
# MDEV-22966 Server crashes or hangs with SET ROLE when started with skip-grant-tables
#
set role x;
ERROR HY000: The MariaDB server is running with the --skip-grant-tables option so it cannot execute this statement
#
# End of 10.2 tests
#

11
mysql-test/t/skip_grants.test
View File

@ -128,3 +128,14 @@ show global status like 'Acl%';
--echo #
--echo # End of 10.1 tests
--echo #
--echo #
--echo # MDEV-22966 Server crashes or hangs with SET ROLE when started with skip-grant-tables
--echo #
--error ER_OPTION_PREVENTS_STATEMENT
set role x;
--echo #
--echo # End of 10.2 tests
--echo #

6
sql/sql_acl.cc
View File

@ -2770,6 +2770,12 @@ end:
int acl_check_setrole(THD *thd, char *rolename, ulonglong *access)
{
if (!initialized)
{
my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--skip-grant-tables");
return 1;
}
return check_user_can_set_role(thd, thd->security_ctx->priv_user,
thd->security_ctx->host, thd->security_ctx->ip, rolename, access);
}