Merge pull request #5459 from inikep/nullmerge-8_0_39-to-8_4

Null-merge branch '8.0' (after 8.0.39) into '8.4' (that is 8.4.2-2)
percona · Oct 22, 2024 · 337b8a6 · 337b8a6
2 parents dfbb012 + f0692f4
commit 337b8a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/mysql-test/suite/auth_sec/r/grant_as_ddl.result b/mysql-test/suite/auth_sec/r/grant_as_ddl.result
@@ -1,5 +1,6 @@
 SET @start_partial_revokes = @@global.partial_revokes;
 SET @@global.partial_revokes=ON;
+RESET MASTER;
 SET @@global.partial_revokes = ON;
 SELECT @@global.partial_revokes;
 @@global.partial_revokes

diff --git a/mysql-test/suite/auth_sec/t/grant_as_ddl.test b/mysql-test/suite/auth_sec/t/grant_as_ddl.test
@@ -14,6 +14,7 @@
 # Set partial revokes to ON
 SET @start_partial_revokes = @@global.partial_revokes;
 SET @@global.partial_revokes=ON;
+RESET MASTER;
 
 --disable_query_log
 CALL mtr.add_suppression("one or more privileges granted through");