Merging upstream version 1:11.4.2.

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

4 files changed, 7 insertions, 6 deletions

diff --git a/mysql-test/suite/roles/admin.result b/mysql-test/suite/roles/admin.result
index 2ecbfae4..4e8fa965 100644
--- a/mysql-test/suite/roles/admin.result
+++ b/mysql-test/suite/roles/admin.result
@@ -8,9 +8,9 @@ create role role3 with admin role1;
 create role role4 with admin root@localhost;
 connect  c1, localhost, foo,,;
 create role role5 with admin root@localhost;
-ERROR 42000: Access denied; you need (at least one of) the SUPER, SET USER privilege(s) for this operation
+ERROR 42000: Access denied; you need (at least one of) the SET USER privilege(s) for this operation
 create role role5 with admin role3;
-ERROR 42000: Access denied; you need (at least one of) the SUPER, SET USER privilege(s) for this operation
+ERROR 42000: Access denied; you need (at least one of) the SET USER privilege(s) for this operation
 create role role5 with admin foo@localhost;
 connection default;
 call mtr.add_suppression("Invalid roles_mapping table entry user:'foo@bar', rolename:'role6'");
diff --git a/mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test b/mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test
index dac6eab2..e397989b 100644
--- a/mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test
+++ b/mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test
@@ -17,7 +17,7 @@ alter table user drop column max_statement_time;
 
 flush privileges;
 
---replace_regex /10\d\d\d\d/MYSQL_VERSION_ID/
+--replace_regex /11\d\d\d\d/MYSQL_VERSION_ID/
 --error ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE
 create role test_role;
 --error ER_CANNOT_USER
@@ -30,8 +30,6 @@ after password_expired;
 create role test_role;
 create user test_user@localhost;
 grant test_role to test_user@localhost;
-#--replace_regex /10\d\d\d\d/MYSQL_VERSION_ID/
-#--error ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE
 set default role test_role for root@localhost;
 drop role test_role;
 drop user test_user@localhost;
diff --git a/mysql-test/suite/roles/definer.result b/mysql-test/suite/roles/definer.result
index 38242c81..08e72193 100644
--- a/mysql-test/suite/roles/definer.result
+++ b/mysql-test/suite/roles/definer.result
@@ -1,3 +1,4 @@
+call mtr.add_suppression('Event Scheduler:');
 create database mysqltest1;
 use mysqltest1;
 create table t1 (a int, b int, c int);
@@ -670,7 +671,7 @@ CREATE DEFINER='r1' PROCEDURE user1_proc2() SQL SECURITY INVOKER
 BEGIN
 SELECT NOW(), VERSION();
 END;//
-ERROR 42000: Access denied; you need (at least one of) the SUPER, SET USER privilege(s) for this operation
+ERROR 42000: Access denied; you need (at least one of) the SET USER privilege(s) for this operation
 set role r1;
 CREATE DEFINER='r1' PROCEDURE user1_proc2() SQL SECURITY INVOKER
 BEGIN
diff --git a/mysql-test/suite/roles/definer.test b/mysql-test/suite/roles/definer.test
index 4cd42d59..c08df87a 100644
--- a/mysql-test/suite/roles/definer.test
+++ b/mysql-test/suite/roles/definer.test
@@ -7,6 +7,8 @@
 --source include/not_embedded.inc
 --source include/default_charset.inc
 
+call mtr.add_suppression('Event Scheduler:');
+
 let MYSQLD_DATADIR=`select @@datadir`;
 
 create database mysqltest1;