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

MDEV-17932 : assertion in multi RENAME USER command.

Browse Source 
Sort acl_users inside the mysql_rename_user()'s loop, after every
successful iteration.

This is needed because on the next loop's iteration find_user_exact()
is used, which requires correct sorting by name.
This commit is contained in:
Vladislav Vaintroub 2018-12-08 01:16:05 +01:00
parent a80f5fdbd1
commit b1c41e112c
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/main/grant.result
View File

@ -2762,3 +2762,11 @@ DROP USER dummy@localhost;
# #
# End of 10.2 tests # End of 10.2 tests
# #
#
# MDEV-17932 : Assertion upon double RENAME USER
#
CREATE USER foo@localhost;
CREATE USER bar2@localhost;
RENAME USER foo@localhost TO bar1@localhost, bar1@localhost TO bar3@localhost;
DROP USER bar2@localhost;
DROP USER bar3@localhost;

9
mysql-test/main/grant.test
View File

@ -2258,3 +2258,12 @@ DROP USER dummy@localhost;
--echo # --echo #
--echo # End of 10.2 tests --echo # End of 10.2 tests
--echo # --echo #
--echo #
--echo # MDEV-17932 : Assertion upon double RENAME USER
--echo #
CREATE USER foo@localhost;
CREATE USER bar2@localhost;
RENAME USER foo@localhost TO bar1@localhost, bar1@localhost TO bar3@localhost;
DROP USER bar2@localhost;
DROP USER bar3@localhost;

2
sql/sql_acl.cc
View File

@ -10365,9 +10365,9 @@ bool mysql_rename_user(THD *thd, List <LEX_USER> &list)
continue; continue;
} }
some_users_renamed= TRUE; some_users_renamed= TRUE;
rebuild_acl_users();
} }
rebuild_acl_users();
/* Rebuild 'acl_check_hosts' since 'acl_users' has been modified */ /* Rebuild 'acl_check_hosts' since 'acl_users' has been modified */
rebuild_check_host(); rebuild_check_host();