summaryrefslogtreecommitdiff
path: root/mysql-test/main/grant.test
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2022-05-10 11:53:59 +0200
committerSergei Golubchik <serg@mariadb.org>2022-05-10 14:01:23 +0200
commit3bc98a4ec4e7e7493ee93048dddfad87ceb3d8ff (patch)
treead189995a78fdc6068059e65b8455d3d4e61e719 /mysql-test/main/grant.test
parentf4d671bff2c4dcfe1bb2af6d40122576e4fcfa91 (diff)
parentfe3d07cab82b2215dc64f52ac93122072c33d021 (diff)
downloadmariadb-git-3bc98a4ec4e7e7493ee93048dddfad87ceb3d8ff.tar.gz
Merge branch '10.5' into 10.6
Diffstat (limited to 'mysql-test/main/grant.test')
-rw-r--r--mysql-test/main/grant.test18
1 files changed, 11 insertions, 7 deletions
diff --git a/mysql-test/main/grant.test b/mysql-test/main/grant.test
index c8ca440b3e8..a243967a9c7 100644
--- a/mysql-test/main/grant.test
+++ b/mysql-test/main/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
@@ -12,12 +12,6 @@ SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creato
SET GLOBAL log_bin_trust_function_creators = 1;
select priv into @root_priv from mysql.global_priv where user='root' and host='localhost';
-# Cleanup
---disable_warnings
-drop table if exists t1;
-drop database if exists mysqltest;
---enable_warnings
-
connect (master,localhost,root,,);
connection master;
SET NAMES binary;
@@ -2288,6 +2282,16 @@ 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 #