Merge branch '10.2' into 10.3

1 files changed, 9 insertions, 0 deletions

diff --git a/mysql-test/main/events_trans.result b/mysql-test/main/events_trans.result
index 873f0441089..a7b268fe2a7 100644
--- a/mysql-test/main/events_trans.result
+++ b/mysql-test/main/events_trans.result
@@ -15,6 +15,8 @@ create table t1 (a varchar(255)) engine=innodb;
 begin work;
 insert into t1 (a) values ("OK: create event");
 create event e1 on schedule every 1 day do select 1;
+Warnings:
+Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 rollback work;
 select * from t1;
 a
@@ -60,11 +62,14 @@ OK: drop event if exists
 delete from t1;
 commit work;
 create event e1 on schedule every 1 day do select 1;
+Warnings:
+Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 begin work;
 insert into t1 (a) values ("OK: create event if not exists");
 create event if not exists e1 on schedule every 2 day do select 2;
 Warnings:
 Note	1537	Event 'e1' already exists
+Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 rollback work;
 select * from t1;
 a
@@ -96,6 +101,8 @@ OK: alter event rename: rename to same name
 delete from t1;
 commit work;
 create event e2 on schedule every 3 day do select 3;
+Warnings:
+Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 begin work;
 insert into t1 (a) values ("OK: alter event rename: destination exists");
 alter event e2 rename to e1;
@@ -126,6 +133,8 @@ DROP EVENT IF EXISTS e1;
 CREATE TABLE t1 (a INT) ENGINE=InnoDB;
 CREATE TABLE t2 (a INT);
 CREATE EVENT e1 ON SCHEDULE EVERY 1 DAY DO SELECT 1;
+Warnings:
+Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 START TRANSACTION;
 INSERT INTO t1 VALUES (1);
 SAVEPOINT A;