MDEV-7635: Update tests to adapt to the new default sql_mode

5 files changed, 21 insertions, 2 deletions

diff --git a/mysql-test/suite/binlog_encryption/binlog_row_annotate.result b/mysql-test/suite/binlog_encryption/binlog_row_annotate.result
index f4cfc86619d..e72fc9faa6e 100644
--- a/mysql-test/suite/binlog_encryption/binlog_row_annotate.result
+++ b/mysql-test/suite/binlog_encryption/binlog_row_annotate.result
@@ -50,6 +50,7 @@ master-bin.000001	#	Query	#	#	CREATE DATABASE test2
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	CREATE DATABASE test3
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO test1.t1 VALUES (1), (2), (3)
 master-bin.000001	#	Table_map	#	#	table_id: # (test1.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
@@ -147,6 +148,9 @@ CREATE DATABASE test3
 BEGIN
 /*!*/;
 # at #
+# at #
+#010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
+#Q> INSERT INTO test1.t1 VALUES (1), (2), (3)
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #
 # at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
@@ -368,6 +372,9 @@ CREATE DATABASE test1
 BEGIN
 /*!*/;
 # at #
+# at #
+#010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
+#Q> INSERT INTO test1.t1 VALUES (1), (2), (3)
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #
 # at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
diff --git a/mysql-test/suite/binlog_encryption/binlog_xa_recover.result b/mysql-test/suite/binlog_encryption/binlog_xa_recover.result
index 6719d891ee2..af36fe277a1 100644
--- a/mysql-test/suite/binlog_encryption/binlog_xa_recover.result
+++ b/mysql-test/suite/binlog_encryption/binlog_xa_recover.result
@@ -51,6 +51,7 @@ master-bin.000003	#	Gtid_list	#	#	[#-#-#]
 master-bin.000003	#	Binlog_checkpoint	#	#	master-bin.000002
 master-bin.000003	#	Binlog_checkpoint	#	#	master-bin.000003
 master-bin.000003	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000003	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (102, REPEAT("x", 4100))
 master-bin.000003	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000003	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000003	#	Xid	#	#	COMMIT /* XID */
@@ -63,6 +64,7 @@ master-bin.000004	#	Gtid_list	#	#	[#-#-#]
 master-bin.000004	#	Binlog_checkpoint	#	#	master-bin.000003
 master-bin.000004	#	Binlog_checkpoint	#	#	master-bin.000004
 master-bin.000004	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000004	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (1, REPEAT("x", 4100))
 master-bin.000004	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000004	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000004	#	Xid	#	#	COMMIT /* XID */
@@ -74,10 +76,12 @@ master-bin.000005	#	Start_encryption	#	#
 master-bin.000005	#	Gtid_list	#	#	[#-#-#]
 master-bin.000005	#	Binlog_checkpoint	#	#	master-bin.000004
 master-bin.000005	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000005	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (2, NULL)
 master-bin.000005	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000005	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000005	#	Xid	#	#	COMMIT /* XID */
 master-bin.000005	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000005	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (3, REPEAT("x", 4100))
 master-bin.000005	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000005	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000005	#	Xid	#	#	COMMIT /* XID */
@@ -140,6 +144,7 @@ master-bin.000004	#	Start_encryption	#	#
 master-bin.000004	#	Gtid_list	#	#	[#-#-#]
 master-bin.000004	#	Binlog_checkpoint	#	#	master-bin.000001
 master-bin.000004	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000004	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (13, NULL)
 master-bin.000004	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000004	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000004	#	Xid	#	#	COMMIT /* XID */
@@ -164,6 +169,7 @@ master-bin.000004	#	Start_encryption	#	#
 master-bin.000004	#	Gtid_list	#	#	[#-#-#]
 master-bin.000004	#	Binlog_checkpoint	#	#	master-bin.000001
 master-bin.000004	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000004	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (13, NULL)
 master-bin.000004	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000004	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000004	#	Xid	#	#	COMMIT /* XID */
@@ -232,6 +238,7 @@ master-bin.000004	#	Gtid_list	#	#	[#-#-#]
 master-bin.000004	#	Binlog_checkpoint	#	#	master-bin.000003
 master-bin.000004	#	Binlog_checkpoint	#	#	master-bin.000004
 master-bin.000004	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000004	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (24, REPEAT("x", 4100))
 master-bin.000004	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000004	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000004	#	Xid	#	#	COMMIT /* XID */
diff --git a/mysql-test/suite/binlog_encryption/rpl_binlog_errors.result b/mysql-test/suite/binlog_encryption/rpl_binlog_errors.result
index a54b84227e5..8820aa23f53 100644
--- a/mysql-test/suite/binlog_encryption/rpl_binlog_errors.result
+++ b/mysql-test/suite/binlog_encryption/rpl_binlog_errors.result
@@ -88,6 +88,7 @@ DELETE FROM t2;
 RESET MASTER;
 ###################### TEST #7
 SET GLOBAL debug_dbug="+d,error_unique_log_filename";
+SET @@binlog_annotate_row_events= 0;
 SELECT count(*) FROM t4;
 count(*)
 0
diff --git a/mysql-test/suite/binlog_encryption/rpl_gtid_basic.result b/mysql-test/suite/binlog_encryption/rpl_gtid_basic.result
index dd946ec3107..4e17669605f 100644
--- a/mysql-test/suite/binlog_encryption/rpl_gtid_basic.result
+++ b/mysql-test/suite/binlog_encryption/rpl_gtid_basic.result
@@ -465,9 +465,11 @@ include/stop_slave.inc
 connection server_1;
 SET gtid_domain_id=2;
 SET gtid_seq_no=1030;
+SET @@binlog_annotate_row_events= 0;
 INSERT INTO t1 VALUES (17);
 INSERT INTO t1 VALUES (18);
 INSERT INTO t1 VALUES (19);
+SET @@binlog_annotate_row_events= 1;
 connection server_2;
 SET sql_slave_skip_counter= 5;
 include/start_slave.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_switch_stm_row_mixed.result b/mysql-test/suite/binlog_encryption/rpl_switch_stm_row_mixed.result
index 6c709945111..2f7f1b07cb4 100644
--- a/mysql-test/suite/binlog_encryption/rpl_switch_stm_row_mixed.result
+++ b/mysql-test/suite/binlog_encryption/rpl_switch_stm_row_mixed.result
@@ -21,7 +21,7 @@ binlog_format	ROW
 set global binlog_format=DEFAULT;
 show global variables like "binlog_format%";
 Variable_name	Value
-binlog_format	STATEMENT
+binlog_format	MIXED
 set global binlog_format=MIXED;
 show global variables like "binlog_format%";
 Variable_name	Value
@@ -135,11 +135,13 @@ insert into t1 values(concat("for_23_",UUID()));
 insert into t1 select "yesterday_24_";
 create table t2 ENGINE=MyISAM select rpad(UUID(),100,' ');
 create table t3 select 1 union select UUID();
+SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
 create table t4 select * from t1 where 3 in (select 1 union select 2 union select UUID() union select 3);
+SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
 create table t5 select * from t1 where 3 in (select 1 union select 2 union select curdate() union select 3);
 Warnings:
 Warning	1292	Incorrect datetime value: '3'
-insert into t5 select UUID() from t1 where 3 in (select 1 union select 2 union select 3 union select * from t4);
+insert ignore into t5 select UUID() from t1 where 3 in (select 1 union select 2 union select 3 union select * from t4);
 create procedure foo()
 begin
 insert into t1 values("work_25_");