database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-30154: Assertion `strcasecmp(rolename, public_name.str) || acl_public == role' failed in acl_update_role on GRANT ... TO PUBLIC

Browse Source 
Reset of acl_public was made too early (before saving it to restore in case
of error).
This commit is contained in:
Oleksandr Byelkin
2022-12-07 14:59:06 +01:00
parent a5be6c91cb
commit 22491e627a
3 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mysql-test/main/public_basic.result
View File

@ -100,6 +100,23 @@ delete from mysql.global_priv where user="PUBLIC";
flush privileges; flush privileges;
grant execute on procedure mtr.add_suppression to public; grant execute on procedure mtr.add_suppression to public;
revoke execute on procedure mtr.add_suppression from public; revoke execute on procedure mtr.add_suppression from public;
#
# MDEV-30154: Assertion `strcasecmp(rolename, public_name.str) ||
# acl_public == role' failed in acl_update_role on GRANT ... TO PUBLIC
#
call mtr.add_suppression("Can't open and lock privilege tables");
USE test;
GRANT SELECT ON *.* TO PUBLIC;
LOCK TABLES mysql.time_zone WRITE,mysql.proc WRITE;
FLUSH PRIVILEGES;
ERROR HY000: Table 'db' was not locked with LOCK TABLES
LOCK TABLE nonexisting WRITE;
ERROR 42S02: Table 'test.nonexisting' doesn't exist
GRANT SELECT ON *.* TO PUBLIC;
REVOKE SELECT ON *.* FROM PUBLIC;
#
# End of 10.11 test
#
# clean up # clean up
delete from mysql.global_priv where user="PUBLIC"; delete from mysql.global_priv where user="PUBLIC";
flush privileges; flush privileges;

20
mysql-test/main/public_basic.test
View File

@ -109,6 +109,26 @@ flush privileges;
grant execute on procedure mtr.add_suppression to public; grant execute on procedure mtr.add_suppression to public;
revoke execute on procedure mtr.add_suppression from public; revoke execute on procedure mtr.add_suppression from public;
--echo #
--echo # MDEV-30154: Assertion `strcasecmp(rolename, public_name.str) ||
--echo # acl_public == role' failed in acl_update_role on GRANT ... TO PUBLIC
--echo #
call mtr.add_suppression("Can't open and lock privilege tables");
USE test;
GRANT SELECT ON *.* TO PUBLIC;
LOCK TABLES mysql.time_zone WRITE,mysql.proc WRITE;
--error 1100
FLUSH PRIVILEGES;
--error 1146
LOCK TABLE nonexisting WRITE;
GRANT SELECT ON *.* TO PUBLIC;
REVOKE SELECT ON *.* FROM PUBLIC;
--echo #
--echo # End of 10.11 test
--echo #
-- echo # clean up -- echo # clean up
delete from mysql.global_priv where user="PUBLIC"; delete from mysql.global_priv where user="PUBLIC";
flush privileges; flush privileges;

2
sql/sql_acl.cc
View File

@ -2918,7 +2918,6 @@ bool acl_reload(THD *thd)
int result; int result;
DBUG_ENTER("acl_reload"); DBUG_ENTER("acl_reload");
acl_public= NULL;
Grant_tables tables; Grant_tables tables;
/* /*
@ -2963,6 +2962,7 @@ bool acl_reload(THD *thd)
old_mem= acl_memroot; old_mem= acl_memroot;
delete_dynamic(&acl_wild_hosts); delete_dynamic(&acl_wild_hosts);
my_hash_free(&acl_check_hosts); my_hash_free(&acl_check_hosts);
acl_public= NULL;
if ((result= acl_load(thd, tables))) if ((result= acl_load(thd, tables)))
{ // Error. Revert to old list { // Error. Revert to old list