MDEV-6720 - enable connection log in mysqltest by default

1 files changed, 18 insertions, 16 deletions

diff --git a/mysql-test/suite/rpl/r/rpl_domain_id_filter_io_crash.result b/mysql-test/suite/rpl/r/rpl_domain_id_filter_io_crash.result
index 0c4fe90ba9a..a2b1d03c4fd 100644
--- a/mysql-test/suite/rpl/r/rpl_domain_id_filter_io_crash.result
+++ b/mysql-test/suite/rpl/r/rpl_domain_id_filter_io_crash.result
@@ -1,6 +1,6 @@
 include/master-slave.inc
 [connection master]
-# On master
+connection master;
 SET @@session.gtid_domain_id= 1;
 SELECT @@session.gtid_domain_id;
 @@session.gtid_domain_id
@@ -10,7 +10,8 @@ INSERT INTO t1 VALUES(1);
 SELECT * FROM t1;
 i
 1
-# On slave
+connection slave;
+connection slave;
 call mtr.add_suppression("Slave I/O: Relay log write failure: could not queue event from master.*");
 # Case 0 : Start slave with IGNORE_DOMAIN_IDS=(), then restart
 #          replication with IGNORE_DOMAIN_IDS=() after IO thread is
@@ -26,7 +27,7 @@ include/start_slave.inc
 DO_DOMAIN_IDS (AFTER)     : 
 IGNORE_DOMAIN_IDS (AFTER) : 
 SET @@global.debug_dbug="+d,kill_slave_io_before_commit";
-# On master
+connection master;
 START TRANSACTION;
 INSERT INTO t1 VALUES(2);
 INSERT INTO t1 VALUES(3);
@@ -36,7 +37,7 @@ i
 1
 2
 3
-# On slave
+connection slave;
 include/wait_for_slave_io_error.inc [errno=1595]
 SELECT * FROM t1;
 i
@@ -60,7 +61,7 @@ include/start_slave.inc
 DO_DOMAIN_IDS (AFTER)     : 
 IGNORE_DOMAIN_IDS (AFTER) : 1
 SET @@global.debug_dbug="+d,kill_slave_io_before_commit";
-# On master
+connection master;
 START TRANSACTION;
 INSERT INTO t1 VALUES(4);
 INSERT INTO t1 VALUES(5);
@@ -72,7 +73,7 @@ i
 3
 4
 5
-# On slave
+connection slave;
 include/wait_for_slave_io_error.inc [errno=1595]
 SELECT * FROM t1;
 i
@@ -98,7 +99,7 @@ include/start_slave.inc
 DO_DOMAIN_IDS (AFTER)     : 
 IGNORE_DOMAIN_IDS (AFTER) : 
 SET @@global.debug_dbug="+d,kill_slave_io_before_commit";
-# On master
+connection master;
 START TRANSACTION;
 INSERT INTO t1 VALUES(6);
 INSERT INTO t1 VALUES(7);
@@ -125,7 +126,7 @@ i
 9
 10
 11
-# On slave
+connection slave;
 include/wait_for_slave_io_error.inc [errno=1595]
 SELECT * FROM t1;
 i
@@ -158,7 +159,7 @@ include/start_slave.inc
 DO_DOMAIN_IDS (AFTER)     : 
 IGNORE_DOMAIN_IDS (AFTER) : 1
 SET @@global.debug_dbug="+d,kill_slave_io_before_commit";
-# On master
+connection master;
 SET @@session.gtid_domain_id= 1;
 START TRANSACTION;
 INSERT INTO t1 VALUES(12);
@@ -192,7 +193,7 @@ i
 15
 16
 17
-# On slave
+connection slave;
 include/wait_for_slave_io_error.inc [errno=1595]
 SELECT * FROM t1;
 i
@@ -231,7 +232,7 @@ include/start_slave.inc
 DO_DOMAIN_IDS (AFTER)     : 
 IGNORE_DOMAIN_IDS (AFTER) : 1
 SET @@global.debug_dbug="+d,kill_slave_io_after_2_events";
-# On master
+connection master;
 SET @@session.gtid_domain_id= 1;
 START TRANSACTION;
 INSERT INTO t1 VALUES(18);
@@ -271,7 +272,7 @@ i
 21
 22
 23
-# On slave
+connection slave;
 include/wait_for_slave_io_error.inc [errno=1595]
 SELECT * FROM t1;
 i
@@ -318,7 +319,7 @@ include/start_slave.inc
 DO_DOMAIN_IDS (AFTER)     : 
 IGNORE_DOMAIN_IDS (AFTER) : 
 SET @@global.debug_dbug="+d,kill_slave_io_after_2_events";
-# On master
+connection master;
 SET @@session.gtid_domain_id= 1;
 START TRANSACTION;
 INSERT INTO t1 VALUES(24);
@@ -364,7 +365,7 @@ i
 27
 28
 29
-# On slave
+connection slave;
 include/wait_for_slave_io_error.inc [errno=1595]
 SELECT * FROM t1;
 i
@@ -406,9 +407,10 @@ i
 23
 28
 29
-# On master
+connection master;
 DROP TABLE t1;
-# On slave
+connection slave;
+connection slave;
 include/stop_slave.inc
 CHANGE MASTER TO DO_DOMAIN_IDS=(), IGNORE_DOMAIN_IDS=();
 include/start_slave.inc