List:Commits« Previous MessageNext Message »
From:Marc Alff Date:August 28 2012 11:02am
Subject:bzr push into mysql-trunk branch (marc.alff:4354 to 4355)
View as plain text  
 4355 Marc Alff	2012-08-28 [merge]
      Merge mysql-5.6 --> mysql-trunk

    modified:
      mysql-test/suite/perfschema/include/table_aggregate_load.inc
      mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_off.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
 4354 Martin Hansson	2012-08-28 [merge]
      Bug#13985071: Null merge.

=== modified file 'mysql-test/suite/perfschema/include/table_aggregate_load.inc'
--- a/mysql-test/suite/perfschema/include/table_aggregate_load.inc	2011-10-19 21:49:22 +0000
+++ b/mysql-test/suite/perfschema/include/table_aggregate_load.inc	2012-08-28 10:29:12 +0000
@@ -48,17 +48,10 @@ execute dump_objects_summary;
 #
 
 connect (con1, localhost, user1, , );
-
-echo "================== con1 connected ==================";
+select concat(current_user(), " is connected") as status;
 
 --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, , );
-
-echo "================== con2 connected ==================";
+select concat(current_user(), " is connected") as status;
 
 --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, , );
-
-echo "================== con3 connected ==================";
+select concat(current_user(), " is connected") as status;
 
 --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, , );
-
-echo "================== con4 connected ==================";
+select concat(current_user(), " is connected") as status;
 
 --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;

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result	2012-08-28 10:29:12 +0000
@@ -150,7 +150,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result	2012-08-28 10:29:12 +0000
@@ -149,7 +149,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result	2012-08-28 10:29:12 +0000
@@ -150,7 +150,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result	2012-08-28 10:29:12 +0000
@@ -149,7 +149,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result	2012-08-28 10:29:12 +0000
@@ -148,7 +148,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result	2012-08-28 10:29:12 +0000
@@ -147,7 +147,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result	2012-08-28 10:29:12 +0000
@@ -148,7 +148,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result	2012-08-28 10:29:12 +0000
@@ -147,7 +147,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_off.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_off.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_off.result	2012-08-28 10:29:12 +0000
@@ -149,7 +149,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result	2012-08-28 10:29:12 +0000
@@ -150,7 +150,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result	2012-08-28 10:29:12 +0000
@@ -149,7 +149,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result	2012-08-28 10:29:12 +0000
@@ -150,7 +150,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result	2012-08-28 10:29:12 +0000
@@ -149,7 +149,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result	2012-08-28 10:29:12 +0000
@@ -152,7 +152,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result	2012-08-28 10:29:12 +0000
@@ -151,7 +151,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result	2012-08-28 10:29:12 +0000
@@ -152,7 +152,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result	2012-08-28 10:29:12 +0000
@@ -151,7 +151,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result	2012-08-28 10:29:12 +0000
@@ -150,7 +150,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result	2012-08-28 10:29:12 +0000
@@ -149,7 +149,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result	2012-08-28 10:29:12 +0000
@@ -150,7 +150,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result	2012-08-28 10:29:12 +0000
@@ -149,7 +149,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result	2012-08-28 10:29:12 +0000
@@ -152,7 +152,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result	2012-08-28 10:29:12 +0000
@@ -151,7 +151,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result	2012-08-28 10:29:12 +0000
@@ -152,7 +152,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result	2012-08-28 10:29:12 +0000
@@ -151,7 +151,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result	2012-08-28 10:29:12 +0000
@@ -152,7 +152,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result	2012-08-28 10:29:12 +0000
@@ -151,7 +151,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result	2012-08-28 10:29:12 +0000
@@ -152,7 +152,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result	2012-08-28 10:29:12 +0000
@@ -151,7 +151,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result	2012-08-28 10:29:12 +0000
@@ -150,7 +150,9 @@ object_type	object_schema	object_name	co
 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	co
 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
@@ -471,7 +475,9 @@ object_type	object_schema	object_name	co
 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
@@ -658,7 +664,9 @@ object_type	object_schema	object_name	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result	2012-08-28 10:29:12 +0000
@@ -149,7 +149,9 @@ object_type	object_schema	object_name	co
 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	co
 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
@@ -473,7 +477,9 @@ object_type	object_schema	object_name	co
 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
@@ -662,7 +668,9 @@ object_type	object_schema	object_name	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result	2012-08-28 10:29:12 +0000
@@ -150,7 +150,9 @@ object_type	object_schema	object_name	co
 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	co
 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
@@ -471,7 +475,9 @@ object_type	object_schema	object_name	co
 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
@@ -658,7 +664,9 @@ object_type	object_schema	object_name	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result	2012-08-28 10:29:12 +0000
@@ -149,7 +149,9 @@ object_type	object_schema	object_name	co
 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	co
 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
@@ -473,7 +477,9 @@ object_type	object_schema	object_name	co
 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
@@ -662,7 +668,9 @@ object_type	object_schema	object_name	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result	2012-08-28 10:29:12 +0000
@@ -152,7 +152,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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
@@ -650,7 +656,9 @@ object_type	object_schema	object_name	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result	2012-08-28 10:29:12 +0000
@@ -151,7 +151,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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
@@ -649,7 +655,9 @@ object_type	object_schema	object_name	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result	2012-08-28 10:29:12 +0000
@@ -152,7 +152,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result	2012-08-28 10:29:12 +0000
@@ -151,7 +151,9 @@ object_type	object_schema	object_name	co
 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	co
 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	co
 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	co
 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

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (marc.alff:4354 to 4355) Marc Alff28 Aug