From f354e457e1c4171ce38cd3db3e492640db95036c Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Wed, 27 Apr 2022 18:48:06 +0200
Subject: [PATCH] Bug#33578113: DROP privilege on performance_schema.* can't be
 revoked

test case only
---
 mysql-test/r/grant.result | 10 ++++++++--
 mysql-test/t/grant.test   | 18 +++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
index bd24c5bf380..e4e4e2339e5 100644
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -2,8 +2,6 @@ set GLOBAL sql_mode="";
 set LOCAL sql_mode="";
 SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators;
 SET GLOBAL log_bin_trust_function_creators = 1;
-drop table if exists t1;
-drop database if exists mysqltest;
 connect  master,localhost,root,,;
 connection master;
 SET NAMES binary;
@@ -2785,5 +2783,13 @@ DROP USER foo;
 DROP TABLE db.t;
 DROP DATABASE db;
 #
+# Bug#33578113: DROP privilege on performance_schema.* can't be revoked
+#
+connection default;
+CREATE USER bug33578113;
+GRANT DROP ON performance_schema.* TO bug33578113;
+REVOKE DROP ON performance_schema.* FROM bug33578113;
+DROP USER bug33578113;
+#
 # End of 10.2 tests
 #
diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test
index fa3a690a2ee..5f862db1f35 100644
--- a/mysql-test/t/grant.test
+++ b/mysql-test/t/grant.test
@@ -1,7 +1,7 @@
 # Test of GRANT commands
 
 # Grant tests not performed with embedded server
--- source include/not_embedded.inc
+--source include/not_embedded.inc
 
 # Save the initial number of concurrent sessions
 --source include/count_sessions.inc
@@ -11,12 +11,6 @@ set LOCAL sql_mode="";
 SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators;
 SET GLOBAL log_bin_trust_function_creators = 1;
 
-# Cleanup
---disable_warnings
-drop table if exists t1;
-drop database if exists mysqltest;
---enable_warnings
-
 connect (master,localhost,root,,);
 connection master;
 SET NAMES binary;
@@ -2292,6 +2286,16 @@ DROP USER foo;
 DROP TABLE db.t;
 DROP DATABASE db;
 
+--echo #
+--echo # Bug#33578113: DROP privilege on performance_schema.* can't be revoked
+--echo #
+connection default;
+CREATE USER bug33578113;
+GRANT DROP ON performance_schema.* TO bug33578113;
+REVOKE DROP ON performance_schema.* FROM bug33578113;
+DROP USER bug33578113;
+--source include/wait_until_count_sessions.inc
+
 --echo #
 --echo # End of 10.2 tests
 --echo #