Merging upstream version 1:11.4.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 2 insertions, 25 deletions

diff --git a/mysql-test/main/grant_binlog_replay.test b/mysql-test/main/grant_binlog_replay.test
index a3078e50..3fd157df 100644
--- a/mysql-test/main/grant_binlog_replay.test
+++ b/mysql-test/main/grant_binlog_replay.test
@@ -9,12 +9,12 @@
 --echo #
 
 --echo #
---echo # Test that binlog replay statements are not allowed without BINLOG REPLAY or SUPER
+--echo # Test that binlog replay statements are not allowed without BINLOG REPLAY
 --echo #
 
 CREATE USER user1@localhost IDENTIFIED BY '';
 GRANT ALL PRIVILEGES ON *.* TO user1@localhost;
-REVOKE BINLOG REPLAY, SUPER ON *.* FROM user1@localhost;
+REVOKE BINLOG REPLAY ON *.* FROM user1@localhost;
 
 connect (con1,localhost,user1,,);
 connection con1;
@@ -25,7 +25,6 @@ disconnect con1;
 connection default;
 DROP USER user1@localhost;
 
-
 --echo #
 --echo # Test that binlog replay statements are allowed with BINLOG REPLAY
 --echo #
@@ -46,28 +45,6 @@ disconnect con1;
 connection default;
 DROP USER user1@localhost;
 
-
---echo #
---echo # Test that binlog replay statements are allowed with SUPER
---echo #
-
-CREATE USER user1@localhost IDENTIFIED BY '';
-GRANT SUPER ON *.* TO user1@localhost;
-SHOW GRANTS FOR user1@localhost;
-
-connect (con1,localhost,user1,,);
-connection con1;
---error ER_BAD_SLAVE
-# The below fails with a syntax error.
-# This is fine. It's only important that it does not fail on "access denied".
---error ER_SYNTAX_ERROR
-BINLOG '';
---enable_result_log
-disconnect con1;
-
-connection default;
-DROP USER user1@localhost;
-
 --echo #
 --echo # End of 10.5 tests
 --echo #