MDEV-6720 - enable connection log in mysqltest by default

1 files changed, 16 insertions, 14 deletions

diff --git a/mysql-test/suite/rpl/r/rpl_charset.result b/mysql-test/suite/rpl/r/rpl_charset.result
index 221eb16176d..a96cb26dd9d 100644
--- a/mysql-test/suite/rpl/r/rpl_charset.result
+++ b/mysql-test/suite/rpl/r/rpl_charset.result
@@ -4,35 +4,31 @@ set timestamp=1000000000;
 create database mysqltest2 character set latin2;
 set @@character_set_server=latin5;
 create database mysqltest3;
-
---- --master--
 show create database mysqltest2;
 Database	Create Database
 mysqltest2	CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET latin2 */
 show create database mysqltest3;
 Database	Create Database
 mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET latin5 */
-
---- --slave--
+connection slave;
 show create database mysqltest2;
 Database	Create Database
 mysqltest2	CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET latin2 */
 show create database mysqltest3;
 Database	Create Database
 mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET latin5 */
+connection master;
 set @@collation_server=armscii8_bin;
 drop database mysqltest3;
 create database mysqltest3;
-
---- --master--
 show create database mysqltest3;
 Database	Create Database
 mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET armscii8 COLLATE armscii8_bin */
-
---- --slave--
+connection slave;
 show create database mysqltest3;
 Database	Create Database
 mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET armscii8 COLLATE armscii8_bin */
+connection master;
 use mysqltest2;
 create table t1 (a int auto_increment primary key, b varchar(100));
 set character_set_client=cp850, collation_connection=latin2_croatian_ci;
@@ -41,7 +37,6 @@ insert into t1 (b) values(@@collation_server);
 insert into t1 (b) values(@@character_set_client);
 insert into t1 (b) values(@@character_set_connection);
 insert into t1 (b) values(@@collation_connection);
---- --master--
 select * from t1 order by a;
 a	b
 1	armscii8
@@ -49,7 +44,7 @@ a	b
 3	cp850
 4	latin2
 5	latin2_croatian_ci
---- --slave--
+connection slave;
 select * from mysqltest2.t1 order by a;
 a	b
 1	armscii8
@@ -57,6 +52,7 @@ a	b
 3	cp850
 4	latin2
 5	latin2_croatian_ci
+connection master;
 set character_set_client=latin1, collation_connection=latin1_german1_ci;
 truncate table t1;
 insert into t1 (b) values(@@collation_connection);
@@ -64,35 +60,37 @@ insert into t1 (b) values(LEAST("Müller","Muffler"));
 set collation_connection=latin1_german2_ci;
 insert into t1 (b) values(@@collation_connection);
 insert into t1 (b) values(LEAST("Müller","Muffler"));
---- --master--
 select * from t1 order by a;
 a	b
 1	latin1_german1_ci
 2	Muffler
 3	latin1_german2_ci
 4	Müller
---- --slave--
+connection slave;
 select * from mysqltest2.t1 order by a;
 a	b
 1	latin1_german1_ci
 2	Muffler
 3	latin1_german2_ci
 4	Müller
+connection master;
 set @a= _cp850 'Müller' collate cp850_general_ci;
 truncate table t1;
 insert into t1 (b) values(collation(@a));
---- --master--
 select * from t1 order by a;
 a	b
 1	cp850_general_ci
---- --slave--
+connection slave;
 select * from mysqltest2.t1 order by a;
 a	b
 1	cp850_general_ci
+connection master;
 drop database mysqltest2;
 drop database mysqltest3;
+connection slave;
 set global character_set_server=latin2;
 set global character_set_server=latin1;
+connection master;
 set global character_set_server=latin2;
 set global character_set_server=latin1;
 set character_set_client=9999999;
@@ -108,10 +106,14 @@ INSERT INTO t1 (c1, c2) VALUES ('îÕ, ÚÁ ÒÙÂÁÌËÕ','îÕ, ÚÁ ÒÙÂÁÌËÕ');
 select hex(c1), hex(c2) from t1;
 hex(c1)	hex(c2)
 CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
+connection slave;
 select hex(c1), hex(c2) from t1;
 hex(c1)	hex(c2)
 CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
+connection master;
 drop table t1;
+connection slave;
+connection master;
 create table `t1` (
 `pk` varchar(10) not null default '', 
 primary key (`pk`)