1 files changed, 24 insertions, 9 deletions
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
index 50bc51b8da6..d4d19f5db05 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
@@ -149,9 +149,11 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
+connect  con1, localhost, user1, , ;
 select concat(current_user(), " is connected") as status;
 status
 user1@localhost is connected
+connection default;
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -210,6 +212,7 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
+connection con1;
 insert into test.t1 set a=101, b=1, c=1;
 insert into test.t2 set a=102, b=2, c=2;
 insert into test.t2 set a=103, b=3, c=3;
@@ -241,7 +244,7 @@ a	b	c	d
 select * from test.t3 where b=5;
 a	b	c	d
 105	5	5	1
-"================== con1 marker =================="
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
@@ -306,9 +309,11 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	24
 TABLE	test	t3	31
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
+connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -378,6 +383,7 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	24
 TABLE	test	t3	31
+connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -416,7 +422,7 @@ select * from test.t3 where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
-"================== con2 marker =================="
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
@@ -486,9 +492,11 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	24
 TABLE	test	t3	31
+connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
+connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -563,6 +571,7 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	24
 TABLE	test	t3	31
+connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -608,7 +617,7 @@ a	b	c	d
 105	5	5	3
 205	5	5	2
 305	5	5	1
-"================== con3 marker =================="
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
@@ -683,9 +692,11 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	43
 TABLE	test	t2	60
 TABLE	test	t3	82
+connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
+connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
@@ -765,6 +776,7 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	43
 TABLE	test	t2	60
 TABLE	test	t3	82
+connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -817,7 +829,7 @@ a	b	c	d
 205	5	5	3
 305	5	5	2
 405	5	5	1
-"================== con4 marker =================="
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
@@ -897,11 +909,12 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	43
 TABLE	test	t2	60
 TABLE	test	t3	82
+connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
 unlock tables;
-"================== con1 marker =================="
+connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
@@ -981,6 +994,7 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	47
 TABLE	test	t2	64
 TABLE	test	t3	86
+connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
@@ -1144,7 +1158,7 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	47
 TABLE	test	t2	64
 TABLE	test	t3	86
-"================== con1 disconnected =================="
+disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1223,7 +1237,7 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	47
 TABLE	test	t2	64
 TABLE	test	t3	86
-"================== con2 disconnected =================="
+disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1301,7 +1315,7 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	47
 TABLE	test	t2	64
 TABLE	test	t3	86
-"================== con3 disconnected =================="
+disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1378,7 +1392,7 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	47
 TABLE	test	t2	64
 TABLE	test	t3	86
-"================== con4 disconnected =================="
+disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1454,6 +1468,7 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	47
 TABLE	test	t2	64
 TABLE	test	t3	86
+connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="