From b8e75791943d8220fde6c1ab80885e01601253c3 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Thu, 26 Mar 2020 09:29:33 +0400 Subject: MDEV-22040 versioning.truncate_privilege : GRANT fails with "Access denied", for root user main.mysql_upgrade_noengine did not do "FLUSH PRIVILEGES" after restoring the original backed global_priv table. So following tests might fail on lack of some privileges. Adding the FLUSH PRIVILEGES statement. --- mysql-test/main/mysql_upgrade_noengine.result | 4 ++++ mysql-test/main/mysql_upgrade_noengine.test | 3 +++ 2 files changed, 7 insertions(+) diff --git a/mysql-test/main/mysql_upgrade_noengine.result b/mysql-test/main/mysql_upgrade_noengine.result index 79ad04e1849..27afb198c0e 100644 --- a/mysql-test/main/mysql_upgrade_noengine.result +++ b/mysql-test/main/mysql_upgrade_noengine.result @@ -315,3 +315,7 @@ uninstall plugin blackhole; uninstall plugin archive; drop table mysql.global_priv; rename table mysql.global_priv_bak to mysql.global_priv; +FLUSH PRIVILEGES; +SHOW GRANTS FOR root@localhost; +Grants for root@localhost GRANT ALL PRIVILEGES ON *.* TO `root`@`localhost` WITH GRANT OPTION +Grants for root@localhost GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION diff --git a/mysql-test/main/mysql_upgrade_noengine.test b/mysql-test/main/mysql_upgrade_noengine.test index e3c3e718591..5b063fb3d8c 100644 --- a/mysql-test/main/mysql_upgrade_noengine.test +++ b/mysql-test/main/mysql_upgrade_noengine.test @@ -76,3 +76,6 @@ uninstall plugin archive; drop table mysql.global_priv; rename table mysql.global_priv_bak to mysql.global_priv; + +FLUSH PRIVILEGES; +SHOW GRANTS FOR root@localhost; -- cgit v1.2.1