MDEV-6720 - enable connection log in mysqltest by defaultbb-10.2-MDEV-6720

Additional fixes.

13 files changed, 245 insertions, 39 deletions

diff --git a/mysql-test/r/alter_table-big.result b/mysql-test/r/alter_table-big.result
index f7a3ec6502e..32689daa3a6 100644
--- a/mysql-test/r/alter_table-big.result
+++ b/mysql-test/r/alter_table-big.result
@@ -1,5 +1,8 @@
 drop table if exists t1, t2;
 set debug_sync='RESET';
+connect  addconroot, localhost, root,,;
+connect  addconroot2, localhost, root,,;
+connection default;
 create table t1 (n1 int, n2 int, n3 int,
 key (n1, n2, n3),
 key (n2, n3, n1),
@@ -10,10 +13,15 @@ insert into t1 values (1, 2, 3);
 reset master;
 set debug_sync='alter_table_enable_indexes SIGNAL parked WAIT_FOR go';
 alter table t1 enable keys;;
+connection addconroot;
 set debug_sync='now WAIT_FOR parked';
 insert into t2 values (1);
 insert into t1 values (1, 1, 1);;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot;
+connection default;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
@@ -25,36 +33,60 @@ master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (1, 1, 1)
 master-bin.000001	#	Query	#	#	COMMIT
 drop tables t1, t2;
+disconnect addconroot;
+disconnect addconroot2;
 set debug_sync='RESET';
 End of 5.0 tests
 drop table if exists t1, t2, t3;
+connect  addconroot, localhost, root,,;
+connect  addconroot2, localhost, root,,;
+connection default;
 create table t1 (i int);
 reset master;
 set debug_sync='alter_table_before_main_binlog SIGNAL parked WAIT_FOR go';
 alter table t1 change i c char(10) default 'Test1';;
+connection addconroot;
 set debug_sync='now WAIT_FOR parked';
 insert into t1 values ();;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot;
+connection default;
 select * from t1;
 c
 Test1
 set debug_sync='alter_table_before_main_binlog SIGNAL parked WAIT_FOR go';
 alter table t1 change c vc varchar(100) default 'Test2';;
+connection addconroot;
 set debug_sync='now WAIT_FOR parked';
 rename table t1 to t2;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot;
+connection default;
 drop table t2;
 create table t1 (i int);
 set debug_sync='alter_table_before_main_binlog SIGNAL parked WAIT_FOR go';
 alter table t1 change i c char(10) default 'Test3', rename to t2;;
+connection addconroot;
 set debug_sync='now WAIT_FOR parked';
 insert into t2 values();;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot;
+connection default;
 select * from t2;
 c
 Test3
 alter table t2 change c vc varchar(100) default 'Test2', rename to t1;;
+connection addconroot;
+connection default;
 rename table t1 to t3;
+disconnect addconroot;
+disconnect addconroot2;
 drop table t3;
 set debug_sync='alter_table_before_main_binlog SIGNAL parked WAIT_FOR go';
 set debug_sync='RESET';
diff --git a/mysql-test/r/auth_named_pipe.result b/mysql-test/r/auth_named_pipe.result
index 3268b760a22..fb190ccd149 100644
--- a/mysql-test/r/auth_named_pipe.result
+++ b/mysql-test/r/auth_named_pipe.result
@@ -1,8 +1,11 @@
 INSTALL SONAME 'auth_named_pipe';
 CREATE USER 'USERNAME' IDENTIFIED WITH named_pipe;
+connect pipe_con,localhost,$USERNAME,,,,,PIPE;
 SELECT USER(),CURRENT_USER();
 USER()	CURRENT_USER()
 USERNAME@localhost	USERNAME@%
+disconnect pipe_con;
+connection default;
 DROP USER 'USERNAME';
 CREATE USER nosuchuser IDENTIFIED WITH named_pipe;
 ERROR 28000: Access denied for user 'nosuchuser'@'localhost'
diff --git a/mysql-test/r/create-big.result b/mysql-test/r/create-big.result
index bb8c62bb25c..d041419443e 100644
--- a/mysql-test/r/create-big.result
+++ b/mysql-test/r/create-big.result
@@ -1,11 +1,20 @@
+connect  addconroot1, localhost, root,,;
+connect  addconroot2, localhost, root,,;
+connect  addconroot3, localhost, root,,;
+connection default;
 drop table if exists t1,t2,t3,t4,t5;
 set debug_sync='RESET';
 set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
 create table t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 create table t1 (j char(5));;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
 ERROR 42S01: Table 't1' already exists
+connection default;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -14,10 +23,15 @@ t1	CREATE TABLE `t1` (
 drop table t1;
 set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
 create table t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 create table t1 select 'Test' as j;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
 ERROR 42S01: Table 't1' already exists
+connection default;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -27,10 +41,15 @@ drop table t1;
 create table t3 (j char(5));
 set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
 create table t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 create table t1 like t3;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
 ERROR 42S01: Table 't1' already exists
+connection default;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -39,10 +58,15 @@ t1	CREATE TABLE `t1` (
 drop table t1;
 set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
 create table t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 rename table t3 to t1;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
 ERROR 42S01: Table 't1' already exists
+connection default;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -51,10 +75,15 @@ t1	CREATE TABLE `t1` (
 drop table t1;
 set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
 create table t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 alter table t3 rename to t1;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
 ERROR 42S01: Table 't1' already exists
+connection default;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -63,10 +92,15 @@ t1	CREATE TABLE `t1` (
 drop table t1;
 set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
 create table t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 alter table t3 rename to t1, add k int;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
 ERROR 42S01: Table 't1' already exists
+connection default;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -74,30 +108,51 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1,t3;
 set debug_sync='create_table_select_before_open SIGNAL parked WAIT_FOR go';
+connection default;
 set debug_sync='create_table_select_before_open SIGNAL parked WAIT_FOR go';
 create table t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 drop table t1;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
+connection default;
 set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
 create table t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 rename table t1 to t2;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
+connection default;
 drop table t2;
 set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
 create table t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 select * from t1;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
 i
 1
+connection default;
 drop table t1;
 set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
 create table t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 insert into t1 values (2);;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
+connection default;
 select * from t1;
 i
 1
@@ -106,37 +161,62 @@ drop table t1;
 set @a:=0;
 set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
 create table t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 create trigger t1_bi before insert on t1 for each row set @a:=1;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
+connection default;
 select @a;
 @a
 0
 drop table t1;
 set debug_sync='create_table_select_before_lock SIGNAL parked WAIT_FOR go';
 create table t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 drop table t1;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
+connection default;
 set debug_sync='create_table_select_before_lock SIGNAL parked WAIT_FOR go';
 create table t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 rename table t1 to t2;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
+connection default;
 drop table t2;
 set debug_sync='create_table_select_before_lock SIGNAL parked WAIT_FOR go';
 create table t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 select * from t1;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
 i
 1
+connection default;
 drop table t1;
 set debug_sync='create_table_select_before_lock SIGNAL parked WAIT_FOR go';
 create table t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 insert into t1 values (2);;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
+connection default;
 select * from t1;
 i
 1
@@ -145,27 +225,42 @@ drop table t1;
 set @a:=0;
 set debug_sync='create_table_select_before_lock SIGNAL parked WAIT_FOR go';
 create table t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 create trigger t1_bi before insert on t1 for each row set @a:=1;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
+connection default;
 select @a;
 @a
 0
 drop table t1;
 set debug_sync='create_table_select_before_check_if_exists SIGNAL parked WAIT_FOR go';
 create table if not exists t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 drop table t1;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
+connection default;
 create table t1 (i int);
 set @a:=0;
 set debug_sync='create_table_select_before_check_if_exists SIGNAL parked WAIT_FOR go';
 create table if not exists t1 select 1 as i;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 create trigger t1_bi before insert on t1 for each row set @a:=1;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
 Warnings:
 Note	1050	Table 't1' already exists
+connection addconroot1;
+connection default;
 select @a;
 @a
 0
@@ -178,10 +273,15 @@ create table t1 (i int);
 set debug_sync='create_table_like_after_open SIGNAL parked WAIT_FOR go';
 reset master;
 create table t2 like t1;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 insert into t1 values (1);
 drop table t1;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
+connection default;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -203,21 +303,39 @@ create table t1 (i int);
 set debug_sync='create_table_like_before_binlog SIGNAL parked WAIT_FOR go';
 reset master;
 create table t2 like t1;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 insert into t2 values (1);;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
+connection default;
 drop table t2;
 set debug_sync='create_table_like_before_binlog SIGNAL parked WAIT_FOR go';
 create table t2 like t1;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 drop table t2;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
+connection default;
 set debug_sync='create_table_like_before_binlog SIGNAL parked WAIT_FOR go';
 create table t2 like t1;;
+connection addconroot1;
 set debug_sync='now WAIT_FOR parked';
 drop table t1;;
+connection addconroot2;
 set debug_sync='now SIGNAL go';
+connection default;
+connection addconroot1;
+connection default;
 drop table t2;
+disconnect addconroot1;
+disconnect addconroot2;
+disconnect addconroot3;
 set debug_sync='RESET';
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
diff --git a/mysql-test/r/events_stress.result b/mysql-test/r/events_stress.result
index 6015e7c53eb..1a91ff0f528 100644
--- a/mysql-test/r/events_stress.result
+++ b/mysql-test/r/events_stress.result
@@ -9,8 +9,11 @@ GRANT ALL ON *.* TO event_user2@localhost;
 CREATE USER event_user3@localhost;
 CREATE DATABASE events_conn3_db;
 GRANT ALL ON *.* TO event_user3@localhost;
+connect  conn2,localhost,event_user2,,events_conn2_db;
 "In the second connection we create some events which won't be dropped till the end"
+connect  conn3,localhost,event_user3,,events_conn3_db;
 "In the second connection we create some events which won't be dropped till the end"
+connection default;
 USE events_conn1_test2;
 CREATE EVENT ev_drop1 ON SCHEDULE EVERY 10 MINUTE DISABLE DO SELECT 1;
 CREATE EVENT ev_drop2 ON SCHEDULE EVERY 10 MINUTE DISABLE DO SELECT 1;
@@ -52,13 +55,21 @@ USE events_conn1_test2;
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';
 COUNT(*)
 50
+connection conn2;
 DROP DATABASE events_conn2_db;
+connection conn3;
 DROP DATABASE events_conn3_db;
+connection default;
 DROP DATABASE events_conn1_test2;
 DROP DATABASE events_conn1_test3;
 SET GLOBAL event_scheduler=off;
 DROP DATABASE events_conn1_test4;
 SET GLOBAL event_scheduler=on;
+connection conn2;
+disconnect conn2;
+connection conn3;
+disconnect conn3;
+connection default;
 USE events_test;
 DROP TABLE fill_it1;
 DROP TABLE fill_it2;
diff --git a/mysql-test/r/grant_cache_ps_prot.result b/mysql-test/r/grant_cache_ps_prot.result
index 5fe57c7c35d..56a98cc076d 100644
--- a/mysql-test/r/grant_cache_ps_prot.result
+++ b/mysql-test/r/grant_cache_ps_prot.result
@@ -7,7 +7,8 @@ set LOCAL query_cache_type=ON;
 set GLOBAL query_cache_size=1355776;
 reset query cache;
 flush status;
------ establish connection root -----
+connect  root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK;
+connection root;
 show grants for current_user;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -26,7 +27,8 @@ insert into test.t1 values ("test.t1");
 select * from t1;
 a
 test.t1
------ establish connection root2 -----
+connect  root2,localhost,root,,mysqltest,$MASTER_MYPORT,$MASTER_MYSOCK;
+connection root2;
 select * from t1;
 a	b	c
 1	1	1
@@ -56,7 +58,8 @@ grant SELECT on mysqltest.* to mysqltest_1@localhost;
 grant SELECT on mysqltest.t1 to mysqltest_2@localhost;
 grant SELECT on test.t1 to mysqltest_2@localhost;
 grant SELECT(a) on mysqltest.t1 to mysqltest_3@localhost;
------ establish connection user1 (user=mysqltest_1) -----
+connect  user1,localhost,mysqltest_1,,mysqltest,$MASTER_MYPORT,$MASTER_MYSOCK;
+connection user1;
 show grants for current_user();
 Grants for mysqltest_1@localhost
 GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
@@ -121,11 +124,13 @@ Qcache_hits	3
 show status like "Qcache_not_cached";
 Variable_name	Value
 Qcache_not_cached	1
------ establish connection unkuser (user=unkuser) -----
+connect  unkuser,localhost,unkuser,,,$MASTER_MYPORT,$MASTER_MYSOCK;
+connection unkuser;
 show grants for current_user();
 Grants for @localhost
 GRANT USAGE ON *.* TO ''@'localhost'
------ establish connection user2 (user=mysqltest_2) -----
+connect  user2,localhost,mysqltest_2,,mysqltest,$MASTER_MYPORT,$MASTER_MYSOCK;
+connection user2;
 select "user2";
 user2
 user2
@@ -156,7 +161,8 @@ Qcache_hits	7
 show status like "Qcache_not_cached";
 Variable_name	Value
 Qcache_not_cached	2
------ establish connection user3 (user=mysqltest_3) -----
+connect  user3,localhost,mysqltest_3,,mysqltest,$MASTER_MYPORT,$MASTER_MYSOCK;
+connection user3;
 select "user3";
 user3
 user3
@@ -181,7 +187,8 @@ Qcache_hits	7
 show status like "Qcache_not_cached";
 Variable_name	Value
 Qcache_not_cached	3
------ establish connection user4 (user=mysqltest_1) -----
+connect  user4,localhost,mysqltest_1,,*NO-ONE*,$MASTER_MYPORT,$MASTER_MYSOCK;
+connection user4;
 select "user4";
 user4
 user4
@@ -212,8 +219,21 @@ Qcache_hits	8
 show status like "Qcache_not_cached";
 Variable_name	Value
 Qcache_not_cached	4
------ close connections -----
------ switch to connection default -----
+connection root;
+disconnect root;
+connection root2;
+disconnect root2;
+connection user1;
+disconnect user1;
+connection user2;
+disconnect user2;
+connection user3;
+disconnect user3;
+connection user4;
+disconnect user4;
+connection unkuser;
+disconnect unkuser;
+connection default;
 set names binary;
 delete from mysql.user where user in ("mysqltest_1","mysqltest_2","mysqltest_3");
 delete from mysql.db where user in ("mysqltest_1","mysqltest_2","mysqltest_3");
diff --git a/mysql-test/r/grant_lowercase_fs.result b/mysql-test/r/grant_lowercase_fs.result
index eb27b1d7ea0..e883067eca0 100644
--- a/mysql-test/r/grant_lowercase_fs.result
+++ b/mysql-test/r/grant_lowercase_fs.result
@@ -3,13 +3,18 @@ create user user_1@localhost;
 create user USER_1@localhost;
 GRANT CREATE ON db1.* to user_1@localhost;
 GRANT SELECT ON db1.* to USER_1@localhost;
+connect  con1,localhost,user_1,,db1;
 CREATE TABLE t1(f1 int);
 SELECT * FROM t1;
 ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't1'
+connect  con2,localhost,USER_1,,db1;
 SELECT * FROM t1;
 f1
 CREATE TABLE t2(f1 int);
 ERROR 42000: CREATE command denied to user 'USER_1'@'localhost' for table 't2'
+connection default;
+disconnect con1;
+disconnect con2;
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_1@localhost;
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM USER_1@localhost;
 DROP USER user_1@localhost;
diff --git a/mysql-test/r/merge-big.result b/mysql-test/r/merge-big.result
index b17140a7c79..3b6e116986e 100644
--- a/mysql-test/r/merge-big.result
+++ b/mysql-test/r/merge-big.result
@@ -6,11 +6,11 @@ drop table if exists t1,t2,t3,t4,t5,t6;
 #
 CREATE TABLE t1 (c1 INT) ENGINE= MyISAM;
 LOCK TABLE t1 WRITE;
-# connection con1
+connect  con1,localhost,root,,;
 SET @orig_debug=@@debug;
 SET GLOBAL debug_dbug="+d,sleep_open_and_lock_after_open";
 INSERT INTO t1 VALUES (1);
-# connection default
+connection default;
 # Let INSERT go into thr_multi_lock().
 # Kick INSERT out of thr_multi_lock().
 FLUSH TABLES;
@@ -21,7 +21,8 @@ FLUSH TABLES;
 SELECT * FROM t1;
 c1
 UNLOCK TABLES;
-# connection con1
+connection con1;
 SET GLOBAL debug_dbug=@orig_debug;
-# connection default
+disconnect con1;
+connection default;
 DROP TABLE t1;
diff --git a/mysql-test/r/myisam-big.result b/mysql-test/r/myisam-big.result
index 95a6e91d766..fd0bcb1224b 100644
--- a/mysql-test/r/myisam-big.result
+++ b/mysql-test/r/myisam-big.result
@@ -34,7 +34,13 @@ insert into t1 select * from t1;
 select count(*) from t1;
 count(*)
 131072
+connect  con2,localhost,root,,;
+connection con2;
 alter table t1 add index (id), add index(sometext), add index(sometext,id);
 alter table t1 disable keys;
 alter table t1 enable keys;
+connection default;
+connection con2;
+disconnect con2;
+connection default;
 drop table t1,t2;
diff --git a/mysql-test/r/mysqlbinlog_row_big.result b/mysql-test/r/mysqlbinlog_row_big.result
index 70e39266d1d..32c6b4d40ed 100644
--- a/mysql-test/r/mysqlbinlog_row_big.result
+++ b/mysql-test/r/mysqlbinlog_row_big.result
@@ -17,9 +17,8 @@ In order for the preceding change in max_allowed_packets' value
 to be seen and used, we must start a new connection.
 The change does not take effect with the current one.
 For simplicity, we just disconnect / reconnect connection default here.
-Disconnecting default connection...
-Reconnecting default connection...
-default connection established, continuing with the test
+disconnect default;
+connect  default, localhost,root,,;
 #
 # Delete all existing binary logs.
 #
diff --git a/mysql-test/r/named_pipe.result b/mysql-test/r/named_pipe.result
index ddd48f0ba91..aaf2fa063e1 100644
--- a/mysql-test/r/named_pipe.result
+++ b/mysql-test/r/named_pipe.result
@@ -1,3 +1,4 @@
+connect pipe_con,localhost,root,,,,,PIPE;
 drop table if exists t1,t2,t3,t4;
 CREATE TABLE t1 (
 Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,
@@ -2154,3 +2155,5 @@ Privat (Private Nutzung)	Mobilfunk
 Warnings:
 Warning	1052	Column 'kundentyp' in group statement is ambiguous
 drop table t1;
+connection default;
+disconnect pipe_con;
diff --git a/mysql-test/r/query_cache_ps_ps_prot.result b/mysql-test/r/query_cache_ps_ps_prot.result
index 4105bc40f94..e3f2da1dbbe 100644
--- a/mysql-test/r/query_cache_ps_ps_prot.result
+++ b/mysql-test/r/query_cache_ps_ps_prot.result
@@ -1,7 +1,7 @@
 set GLOBAL query_cache_type=ON;
 set LOCAL query_cache_type=ON;
----- establish connection con1 (root) ----
----- switch to connection default ----
+connect  con1,localhost,root,,test,$MASTER_MYPORT,;
+connection default;
 set @initial_query_cache_size = @@global.query_cache_size;
 set @@global.query_cache_size=102400;
 flush status;
@@ -49,7 +49,7 @@ c1
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	5
----- switch to connection con1 ----
+connection con1;
 prepare stmt3 from "select * from t1 where c1=10";
 execute stmt3;
 c1
@@ -69,7 +69,7 @@ c1
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	8
----- switch to connection default ----
+connection default;
 prepare stmt10 from "SELECT * FROM t1 WHERE c1 = 100";
 show status like 'Qcache_hits';
 Variable_name	Value
@@ -92,18 +92,18 @@ c1
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	9
----- switch to connection con1 ----
+connection con1;
 SELECT * FROM t1 WHERE c1 = 100;
 c1
 100
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	10
----- switch to connection default ----
+connection default;
 prepare stmt11 from "SELECT * FROM t1 WHERE c1 = 1";
----- switch to connection con1 ----
+connection con1;
 prepare stmt12 from "SELECT * FROM t1 WHERE c1 = 1";
----- switch to connection default ----
+connection default;
 SELECT * FROM t1 WHERE c1 = 1;
 c1
 1
@@ -122,14 +122,14 @@ c1
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	11
----- switch to connection con1 ----
+connection con1;
 execute stmt12;
 c1
 1
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	12
----- switch to connection default ----
+connection default;
 prepare stmt1 from "select * from t1 where c1=?";
 show status like 'Qcache_hits';
 Variable_name	Value
@@ -147,7 +147,7 @@ c1
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	13
----- switch to connection con1 ----
+connection con1;
 set @a=1;
 prepare stmt4 from "select * from t1 where c1=?";
 execute stmt4 using @a;
@@ -169,7 +169,7 @@ execute stmt4 using @a;
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	14
----- switch to connection default ----
+connection default;
 prepare stmt1 from "select * from t1 where c1=10";
 set global query_cache_size=0;
 show status like 'Qcache_hits';
@@ -193,7 +193,7 @@ c1
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	14
----- switch to connection con1 ----
+connection con1;
 execute stmt3;
 c1
 10
@@ -212,7 +212,7 @@ c1
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	14
----- switch to connection default ----
+connection default;
 set global query_cache_size=102400;
 execute stmt1;
 c1
@@ -232,7 +232,7 @@ c1
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	16
----- switch to connection con1 ----
+connection con1;
 execute stmt3;
 c1
 10
@@ -251,7 +251,7 @@ c1
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	19
----- switch to connection default ----
+connection default;
 set global query_cache_size=0;
 show status like 'Qcache_hits';
 Variable_name	Value
@@ -274,7 +274,7 @@ c1
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	19
----- switch to connection con1 ----
+connection con1;
 execute stmt3;
 c1
 10
@@ -293,12 +293,12 @@ c1
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	19
----- switch to connection default ----
+connection default;
 set global query_cache_size=0;
 prepare stmt1 from "select * from t1 where c1=10";
----- switch to connection con1 ----
+connection con1;
 prepare stmt3 from "select * from t1 where c1=10";
----- switch to connection default ----
+connection default;
 set global query_cache_size=102400;
 show status like 'Qcache_hits';
 Variable_name	Value
@@ -321,7 +321,7 @@ c1
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	19
----- switch to connection con1 ----
+connection con1;
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	19
@@ -343,7 +343,7 @@ c1
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	19
----- switch to connection default ----
+connection default;
 set global query_cache_size=0;
 prepare stmt1 from "select * from t1 where c1=?";
 set global query_cache_size=102400;
@@ -372,7 +372,7 @@ show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	19
 drop table t1;
----- disconnect connection con1 ----
+disconnect con1;
 ########################################################################
 #
 # BUG#25843: Changing default database between PREPARE and EXECUTE of
diff --git a/mysql-test/r/shm.result b/mysql-test/r/shm.result
index a2c38627e9d..13f715b4e26 100644
--- a/mysql-test/r/shm.result
+++ b/mysql-test/r/shm.result
@@ -1,3 +1,4 @@
+connect shm_con,localhost,root,,,,$shm_name,SHM;
 drop table if exists t1,t2,t3,t4;
 CREATE TABLE t1 (
 Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,
@@ -2154,6 +2155,8 @@ Privat (Private Nutzung)	Mobilfunk
 Warnings:
 Warning	1052	Column 'kundentyp' in group statement is ambiguous
 drop table t1;
+connection default;
+disconnect shm_con;
 mysqld is alive
 SET @max_allowed_packet= @@global.max_allowed_packet;
 SET @net_buffer_length= @@global.net_buffer_length;
diff --git a/mysql-test/r/ssl-big.result b/mysql-test/r/ssl-big.result
index 39c4f34e46c..54c61507ade 100644
--- a/mysql-test/r/ssl-big.result
+++ b/mysql-test/r/ssl-big.result
@@ -1,3 +1,8 @@
 DROP TABLE IF EXISTS t1, t2;
+connect  ssl_con,localhost,root,,,,,SSL;
 create table t1 (a int);
+disconnect ssl_con;
+connect  ssl_con,localhost,root,,,,,SSL;
 drop table t1;
+connection default;
+disconnect ssl_con;