MDEV-4710 Merge Performance Schema test cases from MySQL 5.6.10

Merged all perfschema tests, except for the following:
perfschema.part_table_io
perfschema.binlog_mix perfschema.binlog_row perfschema.binlog_stmt
perfschema.statement_digest_consumers perfschema.statement_digest
privilege.inc privilege.result

mysql-test/suite/perfschema/include/connection_load.inc

@@ -186,10 +186,45 @@ call dump_all();
 --connection default
 
 --disconnect con4a
+
+# Wait for the disconnect to complete
+let $wait_condition=
+  select count(*) = 5 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER like 'user%';
+--source include/wait_condition.inc
+
 --disconnect con4b
+
+# Wait for the disconnect to complete
+let $wait_condition=
+  select count(*) = 4 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER like 'user%';
+--source include/wait_condition.inc
+
 --disconnect con4c
+
+# Wait for the disconnect to complete
+let $wait_condition=
+  select count(*) = 3 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER like 'user%';
+--source include/wait_condition.inc
+
 --disconnect con5a
+
+# Wait for the disconnect to complete
+let $wait_condition=
+  select count(*) = 2 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER like 'user%';
+--source include/wait_condition.inc
+
 --disconnect con5b
+
+# Wait for the disconnect to complete
+let $wait_condition=
+  select count(*) = 1 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER like 'user%';
+--source include/wait_condition.inc
+
 --disconnect con5c
 
 # Wait for the disconnect to complete

mysql-test/suite/perfschema/include/event_aggregate_load.inc

@@ -80,6 +80,12 @@ echo "================== con1 marker ==================";
 
 --connection default
 
+# Wait for the payload to complete
+let $wait_condition=
+  select count(*) = 1 from performance_schema.events_waits_current
+  where EVENT_NAME= 'idle';
+--source include/wait_condition.inc
+
 echo "================== Step 3 ==================";
 call dump_thread();
 execute dump_waits_account;
@@ -148,6 +154,12 @@ echo "================== con2 marker ==================";
 
 --connection default
 
+# Wait for the payload to complete
+let $wait_condition=
+  select count(*) = 2 from performance_schema.events_waits_current
+  where EVENT_NAME= 'idle';
+--source include/wait_condition.inc
+
 echo "================== Step 5 ==================";
 call dump_thread();
 execute dump_waits_account;
@@ -212,6 +224,12 @@ echo "================== con3 marker ==================";
 
 --connection default
 
+# Wait for the payload to complete
+let $wait_condition=
+  select count(*) = 3 from performance_schema.events_waits_current
+  where EVENT_NAME= 'idle';
+--source include/wait_condition.inc
+
 echo "================== Step 7 ==================";
 call dump_thread();
 execute dump_waits_account;
@@ -276,6 +294,12 @@ echo "================== con4 marker ==================";
 
 --connection default
 
+# Wait for the payload to complete
+let $wait_condition=
+  select count(*) = 4 from performance_schema.events_waits_current
+  where EVENT_NAME= 'idle';
+--source include/wait_condition.inc
+
 echo "================== Step 9 ==================";
 call dump_thread();
 execute dump_waits_account;

mysql-test/suite/perfschema/include/event_aggregate_setup.inc

@@ -111,7 +111,8 @@ update performance_schema.setup_instruments set enabled='YES', timed='YES'
   where name in ('wait/synch/mutex/sql/LOCK_connection_count',
                  'wait/synch/mutex/sql/LOCK_user_locks',
                  'wait/synch/rwlock/sql/LOCK_grant',
-                 'wait/io/file/sql/query_log');
+                 'wait/io/file/sql/query_log',
+                 'idle');
 
 update performance_schema.setup_instruments set enabled='YES', timed='YES'
   where name in ('stage/sql/init',

mysql-test/suite/perfschema/include/sizing_auto.inc

@@ -13,3 +13,4 @@ show status like "%performance_schema%";
 # Note that this output is very dependent on the platform.
 
 show engine performance_schema status;
+

mysql-test/suite/perfschema/include/table_aggregate_load.inc

@@ -48,17 +48,10 @@ execute dump_objects_summary;
 #
 
 connect (con1, localhost, user1, , );
-
+select concat(current_user(), " is connected") as status;
-echo "================== con1 connected ==================";
 
 --connection default
 
-# Wait for the connect to complete
-let $wait_condition=
-  select count(*) = 1 from performance_schema.threads
-  where `TYPE`='FOREGROUND' and PROCESSLIST_USER= 'user1';
---source include/wait_condition.inc
-
 echo "================== Step 2 ==================";
 call dump_thread();
 execute dump_waits_account;
@@ -116,17 +109,10 @@ execute dump_objects_summary;
 # select PROCESSLIST_USER, PROCESSLIST_HOST, INSTRUMENTED from performance_schema.threads;
 
 connect (con2, localhost, user2, , );
-
+select concat(current_user(), " is connected") as status;
-echo "================== con2 connected ==================";
 
 --connection default
 
-# Wait for the connect to complete
-let $wait_condition=
-  select count(*) = 1 from performance_schema.threads
-  where `TYPE`='FOREGROUND' and PROCESSLIST_USER= 'user2';
---source include/wait_condition.inc
-
 echo "================== Step 4 ==================";
 call dump_thread();
 execute dump_waits_account;
@@ -180,17 +166,10 @@ execute dump_waits_table_lock;
 execute dump_objects_summary;
 
 connect (con3, localhost, user3, , );
-
+select concat(current_user(), " is connected") as status;
-echo "================== con3 connected ==================";
 
 --connection default
 
-# Wait for the connect to complete
-let $wait_condition=
-  select count(*) = 1 from performance_schema.threads
-  where `TYPE`='FOREGROUND' and PROCESSLIST_USER= 'user3';
---source include/wait_condition.inc
-
 echo "================== Step 6 ==================";
 call dump_thread();
 execute dump_waits_account;
@@ -244,17 +223,10 @@ execute dump_waits_table_lock;
 execute dump_objects_summary;
 
 connect (con4, localhost, user4, , );
-
+select concat(current_user(), " is connected") as status;
-echo "================== con4 connected ==================";
 
 --connection default
 
-# Wait for the connect to complete
-let $wait_condition=
-  select count(*) = 1 from performance_schema.threads
-  where `TYPE`='FOREGROUND' and PROCESSLIST_USER= 'user4';
---source include/wait_condition.inc
-
 echo "================== Step 8 ==================";
 call dump_thread();
 execute dump_waits_account;

mysql-test/suite/perfschema/r/ddl_session_account_connect_attrs.result

@@ -0,0 +1,9 @@
+ALTER TABLE performance_schema.session_account_connect_attrs
+ADD COLUMN foo INTEGER;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+TRUNCATE TABLE performance_schema.session_account_connect_attrs;
+ERROR HY000: Invalid performance_schema usage.
+ALTER TABLE performance_schema.session_account_connect_attrs ADD INDEX test_index(ATTR_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index ON performance_schema.session_account_connect_attrs(ATTR_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

mysql-test/suite/perfschema/r/ddl_session_connect_attrs.result

@@ -0,0 +1,9 @@
+ALTER TABLE performance_schema.session_connect_attrs
+ADD COLUMN foo INTEGER;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+TRUNCATE TABLE performance_schema.session_connect_attrs;
+ERROR HY000: Invalid performance_schema usage.
+ALTER TABLE performance_schema.session_connect_attrs ADD INDEX test_index(ATTR_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index ON performance_schema.session_connect_attrs(ATTR_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

mysql-test/suite/perfschema/r/dml_session_account_connect_attrs.result

@@ -0,0 +1,25 @@
+SELECT * FROM performance_schema.session_account_connect_attrs
+LIMIT 1;
+SELECT * FROM performance_schema.session_account_connect_attrs
+where ATTR_NAME='FOO' OR ATTR_VALUE='BAR';
+INSERT INTO performance_schema.session_account_connect_attrs
+SET ATTR_NAME='FOO', ATTR_VALUE='BAR',
+ORDINAL_POSITION=100, PROCESS_ID=102;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+UPDATE performance_schema.session_account_connect_attrs
+SET ATTR_NAME='FOO';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+UPDATE performance_schema.session_account_connect_attrs
+SET ATTR_NAME='FOO' WHERE ATTR_VALUE='BAR';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+DELETE FROM performance_schema.session_account_connect_attrs
+WHERE ATTR_VALUE='BAR';
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+DELETE FROM performance_schema.session_account_connect_attrs;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+LOCK TABLES performance_schema.session_account_connect_attrs READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.session_account_connect_attrs WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+UNLOCK TABLES;

mysql-test/suite/perfschema/r/dml_session_connect_attrs.result

@@ -0,0 +1,25 @@
+SELECT * FROM performance_schema.session_connect_attrs
+LIMIT 1;
+SELECT * FROM performance_schema.session_connect_attrs
+where ATTR_NAME='FOO' OR ATTR_VALUE='BAR';
+INSERT INTO performance_schema.session_connect_attrs
+SET ATTR_NAME='FOO', ATTR_VALUE='BAR',
+ORDINAL_POSITION=100, PROCESS_ID=102;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+UPDATE performance_schema.session_connect_attrs
+SET ATTR_NAME='FOO';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+UPDATE performance_schema.session_connect_attrs
+SET ATTR_NAME='FOO' WHERE ATTR_VALUE='BAR';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+DELETE FROM performance_schema.session_connect_attrs
+WHERE ATTR_VALUE='BAR';
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+DELETE FROM performance_schema.session_connect_attrs;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+LOCK TABLES performance_schema.session_connect_attrs READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.session_connect_attrs WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+UNLOCK TABLES;

mysql-test/suite/perfschema/r/short_option_1.result

@@ -15,12 +15,12 @@ Variable_name	Value
 character_set_system	utf8
 show variables like 'log';
 Variable_name	Value
+log	ON
 show variables like 'general_log';
 Variable_name	Value
 general_log	ON
 show variables like 'new';
 Variable_name	Value
-new	ON
 show variables like 'log_warnings';
 Variable_name	Value
 log_warnings	3

mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result

@@ -150,7 +150,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -299,7 +301,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	0
 TABLE	test	t3	31
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -465,7 +469,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	40
 TABLE	test	t2	0
 TABLE	test	t3	72
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -648,7 +654,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	65
 TABLE	test	t2	0
 TABLE	test	t3	123
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result

@@ -149,7 +149,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -298,7 +300,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	24
 TABLE	test	t3	31
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -464,7 +468,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	40
 TABLE	test	t2	54
 TABLE	test	t3	72
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -647,7 +653,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	65
 TABLE	test	t2	90
 TABLE	test	t3	123
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result

@@ -150,7 +150,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -299,7 +301,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	0
 TABLE	test	t3	31
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -465,7 +469,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	40
 TABLE	test	t2	0
 TABLE	test	t3	72
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -648,7 +654,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	65
 TABLE	test	t2	0
 TABLE	test	t3	123
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result

@@ -149,7 +149,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -298,7 +300,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	24
 TABLE	test	t3	31
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -464,7 +468,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	40
 TABLE	test	t2	54
 TABLE	test	t3	72
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -647,7 +653,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	65
 TABLE	test	t2	90
 TABLE	test	t3	123
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result

@@ -148,7 +148,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -301,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	0
 TABLE	test	t3	31
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -475,7 +479,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	0
 TABLE	test	t3	31
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -666,7 +672,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	43
 TABLE	test	t2	0
 TABLE	test	t3	82
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result

@@ -147,7 +147,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -302,7 +304,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	24
 TABLE	test	t3	31
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -480,7 +484,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	24
 TABLE	test	t3	31
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -675,7 +681,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	43
 TABLE	test	t2	60
 TABLE	test	t3	82
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result

@@ -148,7 +148,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -301,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	0
 TABLE	test	t3	31
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -475,7 +479,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	40
 TABLE	test	t2	0
 TABLE	test	t3	72
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -666,7 +672,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	65
 TABLE	test	t2	0
 TABLE	test	t3	123
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result

@@ -147,7 +147,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -302,7 +304,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	24
 TABLE	test	t3	31
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -480,7 +484,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	40
 TABLE	test	t2	54
 TABLE	test	t3	72
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -675,7 +681,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	65
 TABLE	test	t2	90
 TABLE	test	t3	123
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_aggregate_off.result

@@ -149,7 +149,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -298,7 +300,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -464,7 +468,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -647,7 +653,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result

@@ -150,7 +150,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -299,7 +301,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	0
 TABLE	test	t3	31
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -465,7 +469,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	0
 TABLE	test	t3	31
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -648,7 +654,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	43
 TABLE	test	t2	0
 TABLE	test	t3	82
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result

@@ -149,7 +149,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -298,7 +300,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	24
 TABLE	test	t3	31
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -464,7 +468,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	24
 TABLE	test	t3	31
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -647,7 +653,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	43
 TABLE	test	t2	60
 TABLE	test	t3	82
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result

@@ -150,7 +150,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -299,7 +301,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	0
 TABLE	test	t3	31
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -465,7 +469,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	40
 TABLE	test	t2	0
 TABLE	test	t3	72
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -648,7 +654,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	65
 TABLE	test	t2	0
 TABLE	test	t3	123
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result

@@ -149,7 +149,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -298,7 +300,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	18
 TABLE	test	t2	24
 TABLE	test	t3	31
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -464,7 +468,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	40
 TABLE	test	t2	54
 TABLE	test	t3	72
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -647,7 +653,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	65
 TABLE	test	t2	90
 TABLE	test	t3	123
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result

@@ -152,7 +152,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -301,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	8
 TABLE	test	t2	0
 TABLE	test	t3	17
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -467,7 +471,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	0
 TABLE	test	t3	44
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -650,7 +656,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	35
 TABLE	test	t2	0
 TABLE	test	t3	81
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result

@@ -151,7 +151,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -300,7 +302,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	8
 TABLE	test	t2	12
 TABLE	test	t3	17
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -466,7 +470,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	30
 TABLE	test	t3	44
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -649,7 +655,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	35
 TABLE	test	t2	54
 TABLE	test	t3	81
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result

@@ -152,7 +152,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -301,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	8
 TABLE	test	t2	0
 TABLE	test	t3	17
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -467,7 +471,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	0
 TABLE	test	t3	44
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -650,7 +656,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	35
 TABLE	test	t2	0
 TABLE	test	t3	81
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result

@@ -151,7 +151,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -300,7 +302,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	8
 TABLE	test	t2	12
 TABLE	test	t3	17
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -466,7 +470,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	30
 TABLE	test	t3	44
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -649,7 +655,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	35
 TABLE	test	t2	54
 TABLE	test	t3	81
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result

@@ -150,7 +150,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -301,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	8
 TABLE	test	t2	0
 TABLE	test	t3	17
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -471,7 +475,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	8
 TABLE	test	t2	0
 TABLE	test	t3	17
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -658,7 +664,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	23
 TABLE	test	t2	0
 TABLE	test	t3	54
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result

@@ -149,7 +149,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -301,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	8
 TABLE	test	t2	12
 TABLE	test	t3	17
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -473,7 +477,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	8
 TABLE	test	t2	12
 TABLE	test	t3	17
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -662,7 +668,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	23
 TABLE	test	t2	36
 TABLE	test	t3	54
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result

@@ -150,7 +150,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -301,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	8
 TABLE	test	t2	0
 TABLE	test	t3	17
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -471,7 +475,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	0
 TABLE	test	t3	44
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -658,7 +664,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	35
 TABLE	test	t2	0
 TABLE	test	t3	81
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result

@@ -149,7 +149,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -301,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	8
 TABLE	test	t2	12
 TABLE	test	t3	17
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -473,7 +477,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	30
 TABLE	test	t3	44
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -662,7 +668,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	35
 TABLE	test	t2	54
 TABLE	test	t3	81
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result

@@ -152,7 +152,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -301,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	8
 TABLE	test	t2	0
 TABLE	test	t3	17
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -467,7 +471,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	8
 TABLE	test	t2	0
 TABLE	test	t3	17
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -650,7 +656,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	23
 TABLE	test	t2	0
 TABLE	test	t3	54
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result

@@ -151,7 +151,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -300,7 +302,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	8
 TABLE	test	t2	12
 TABLE	test	t3	17
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -466,7 +470,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	8
 TABLE	test	t2	12
 TABLE	test	t3	17
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -649,7 +655,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	23
 TABLE	test	t2	36
 TABLE	test	t3	54
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result

@@ -152,7 +152,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -301,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	8
 TABLE	test	t2	0
 TABLE	test	t3	17
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -467,7 +471,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	0
 TABLE	test	t3	44
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -650,7 +656,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	35
 TABLE	test	t2	0
 TABLE	test	t3	81
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result

@@ -151,7 +151,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -300,7 +302,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	8
 TABLE	test	t2	12
 TABLE	test	t3	17
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -466,7 +470,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	30
 TABLE	test	t3	44
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -649,7 +655,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	35
 TABLE	test	t2	54
 TABLE	test	t3	81
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result

@@ -65,11 +65,12 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	173
+performance_schema_max_statement_classes	174
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	200
+performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
@@ -88,6 +89,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0
@@ -150,7 +152,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -299,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	0
 TABLE	test	t3	14
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -465,7 +471,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	0
 TABLE	test	t3	28
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -648,7 +656,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	30
 TABLE	test	t2	0
 TABLE	test	t3	42
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
@@ -1733,6 +1743,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0

mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result

@@ -64,11 +64,12 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	173
+performance_schema_max_statement_classes	174
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	200
+performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
@@ -87,6 +88,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0
@@ -149,7 +151,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -298,7 +302,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	12
 TABLE	test	t3	14
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -464,7 +470,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	24
 TABLE	test	t3	28
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -647,7 +655,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	30
 TABLE	test	t2	36
 TABLE	test	t3	42
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
@@ -1732,6 +1742,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0

mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result

@@ -65,11 +65,12 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	173
+performance_schema_max_statement_classes	174
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	200
+performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
@@ -88,6 +89,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0
@@ -150,7 +152,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -299,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	0
 TABLE	test	t3	14
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -465,7 +471,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	0
 TABLE	test	t3	28
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -648,7 +656,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	30
 TABLE	test	t2	0
 TABLE	test	t3	42
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
@@ -1733,6 +1743,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0

mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result

@@ -64,11 +64,12 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	173
+performance_schema_max_statement_classes	174
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	200
+performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
@@ -87,6 +88,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0
@@ -149,7 +151,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -298,7 +302,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	12
 TABLE	test	t3	14
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -464,7 +470,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	24
 TABLE	test	t3	28
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -647,7 +655,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	30
 TABLE	test	t2	36
 TABLE	test	t3	42
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
@@ -1732,6 +1742,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0

mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result

@@ -63,11 +63,12 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	173
+performance_schema_max_statement_classes	174
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	200
+performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
@@ -86,6 +87,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0
@@ -148,7 +150,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -299,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	0
 TABLE	test	t3	14
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -469,7 +475,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	0
 TABLE	test	t3	14
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -656,7 +664,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	0
 TABLE	test	t3	28
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
@@ -1769,6 +1779,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0

mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result

@@ -62,11 +62,12 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	173
+performance_schema_max_statement_classes	174
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	200
+performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
@@ -85,6 +86,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0
@@ -147,7 +149,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -299,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	12
 TABLE	test	t3	14
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -471,7 +477,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	12
 TABLE	test	t3	14
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -660,7 +668,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	24
 TABLE	test	t3	28
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
@@ -1787,6 +1797,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0

mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result

@@ -63,11 +63,12 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	173
+performance_schema_max_statement_classes	174
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	200
+performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
@@ -86,6 +87,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0
@@ -148,7 +150,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -299,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	0
 TABLE	test	t3	14
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -469,7 +475,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	0
 TABLE	test	t3	28
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -656,7 +664,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	30
 TABLE	test	t2	0
 TABLE	test	t3	42
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
@@ -1769,6 +1779,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0

mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result

@@ -62,11 +62,12 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	173
+performance_schema_max_statement_classes	174
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	200
+performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
@@ -85,6 +86,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0
@@ -147,7 +149,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -299,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	12
 TABLE	test	t3	14
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -471,7 +477,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	24
 TABLE	test	t3	28
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -660,7 +668,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	30
 TABLE	test	t2	36
 TABLE	test	t3	42
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
@@ -1787,6 +1797,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0

mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result

@@ -65,11 +65,12 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	173
+performance_schema_max_statement_classes	174
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	200
+performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
@@ -88,6 +89,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0
@@ -150,7 +152,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -299,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	0
 TABLE	test	t3	14
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -465,7 +471,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	0
 TABLE	test	t3	14
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -648,7 +656,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	0
 TABLE	test	t3	28
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
@@ -1733,6 +1743,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0

mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result

@@ -64,11 +64,12 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	173
+performance_schema_max_statement_classes	174
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	200
+performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
@@ -87,6 +88,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0
@@ -149,7 +151,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -298,7 +302,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	12
 TABLE	test	t3	14
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -464,7 +470,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	12
 TABLE	test	t3	14
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -647,7 +655,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	24
 TABLE	test	t3	28
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
@@ -1732,6 +1742,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0

mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result

@@ -152,7 +152,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -301,7 +303,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	0
 TABLE	test	t3	14
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -467,7 +471,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	0
 TABLE	test	t3	28
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -650,7 +656,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	30
 TABLE	test	t2	0
 TABLE	test	t3	42
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result

@@ -151,7 +151,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-"================== con1 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user1@localhost is connected
 "================== Step 2 =================="
 call dump_thread();
 username	event_name	count_star
@@ -300,7 +302,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	12
 TABLE	test	t3	14
-"================== con2 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user2@localhost is connected
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
@@ -466,7 +470,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	20
 TABLE	test	t2	24
 TABLE	test	t3	28
-"================== con3 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user3@localhost is connected
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
@@ -649,7 +655,9 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	30
 TABLE	test	t2	36
 TABLE	test	t3	42
-"================== con4 connected =================="
+select concat(current_user(), " is connected") as status;
+status
+user4@localhost is connected
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star

mysql-test/suite/perfschema/r/temp_table_io.result

@@ -99,6 +99,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_session_connect_attrs_lost	0
 Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
 Performance_schema_stage_classes_lost	0

mysql-test/suite/perfschema/t/ddl_session_account_connect_attrs.test

@@ -0,0 +1,15 @@
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.session_account_connect_attrs
+  ADD COLUMN foo INTEGER;
+
+-- error ER_WRONG_PERFSCHEMA_USAGE
+TRUNCATE TABLE performance_schema.session_account_connect_attrs;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.session_account_connect_attrs ADD INDEX test_index(ATTR_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index ON performance_schema.session_account_connect_attrs(ATTR_NAME);

mysql-test/suite/perfschema/t/ddl_session_connect_attrs.test

@@ -0,0 +1,15 @@
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.session_connect_attrs
+  ADD COLUMN foo INTEGER;
+
+-- error ER_WRONG_PERFSCHEMA_USAGE
+TRUNCATE TABLE performance_schema.session_connect_attrs;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.session_connect_attrs ADD INDEX test_index(ATTR_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index ON performance_schema.session_connect_attrs(ATTR_NAME);

mysql-test/suite/perfschema/t/dml_session_account_connect_attrs.test

@@ -0,0 +1,38 @@
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+SELECT * FROM performance_schema.session_account_connect_attrs
+  LIMIT 1;
+
+SELECT * FROM performance_schema.session_account_connect_attrs
+  where ATTR_NAME='FOO' OR ATTR_VALUE='BAR';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+INSERT INTO performance_schema.session_account_connect_attrs
+  SET ATTR_NAME='FOO', ATTR_VALUE='BAR',
+  ORDINAL_POSITION=100, PROCESS_ID=102;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.session_account_connect_attrs
+  SET ATTR_NAME='FOO';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.session_account_connect_attrs
+  SET ATTR_NAME='FOO' WHERE ATTR_VALUE='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.session_account_connect_attrs
+  WHERE ATTR_VALUE='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.session_account_connect_attrs;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.session_account_connect_attrs READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.session_account_connect_attrs WRITE;
+UNLOCK TABLES;

mysql-test/suite/perfschema/t/dml_session_connect_attrs.test

@@ -0,0 +1,38 @@
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+SELECT * FROM performance_schema.session_connect_attrs
+  LIMIT 1;
+
+SELECT * FROM performance_schema.session_connect_attrs
+  where ATTR_NAME='FOO' OR ATTR_VALUE='BAR';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+INSERT INTO performance_schema.session_connect_attrs
+  SET ATTR_NAME='FOO', ATTR_VALUE='BAR',
+  ORDINAL_POSITION=100, PROCESS_ID=102;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.session_connect_attrs
+  SET ATTR_NAME='FOO';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.session_connect_attrs
+  SET ATTR_NAME='FOO' WHERE ATTR_VALUE='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.session_connect_attrs
+  WHERE ATTR_VALUE='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.session_connect_attrs;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.session_connect_attrs READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.session_connect_attrs WRITE;
+UNLOCK TABLES;