mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Merge branch '10.3' into 10.4
This commit is contained in:
@ -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;
|
||||
@ -2284,6 +2278,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 #
|
||||
|
Reference in New Issue
Block a user