summaryrefslogtreecommitdiff
path: root/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result')
-rw-r--r--mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result1447
1 files changed, 1117 insertions, 330 deletions
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
index ee95e4c0417..22b63043c9d 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
@@ -1,12 +1,24 @@
+Warnings:
+Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warnings:
+Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
+Warnings:
+Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
+Warnings:
+Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
+Warnings:
+Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
+Warnings:
+Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
delete from performance_schema.setup_actors
where user in ('user2', 'user4');
delete from performance_schema.setup_objects
where object_name='t2';
select * from performance_schema.setup_actors
order by USER, HOST, ROLE;
-HOST USER ROLE
-localhost user1 %
-localhost user3 %
+HOST USER ROLE ENABLED HISTORY
+localhost user1 % YES YES
+localhost user3 % YES YES
select * from performance_schema.setup_objects
order by object_type, object_schema, object_name;
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME ENABLED TIMED
@@ -20,6 +32,9 @@ events_stages_history_long YES
events_statements_current YES
events_statements_history YES
events_statements_history_long YES
+events_transactions_current YES
+events_transactions_history YES
+events_transactions_history_long YES
events_waits_current YES
events_waits_history YES
events_waits_history_long YES
@@ -37,6 +52,85 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
truncate performance_schema.events_waits_summary_by_host_by_event_name;
truncate performance_schema.events_waits_summary_global_by_event_name;
truncate performance_schema.events_waits_history_long;
+<<<<<<< HEAD
+=======
+show global variables like "performance_schema%";
+Variable_name Value
+performance_schema ON
+performance_schema_accounts_size 100
+performance_schema_digests_size 200
+performance_schema_events_stages_history_long_size 1000
+performance_schema_events_stages_history_size 10
+performance_schema_events_statements_history_long_size 1000
+performance_schema_events_statements_history_size 10
+performance_schema_events_transactions_history_long_size 1000
+performance_schema_events_transactions_history_size 10
+performance_schema_events_waits_history_long_size 10000
+performance_schema_events_waits_history_size 10
+performance_schema_hosts_size 100
+performance_schema_max_cond_classes 80
+performance_schema_max_cond_instances 1000
+performance_schema_max_digest_length 1024
+performance_schema_max_file_classes 80
+performance_schema_max_file_handles 32768
+performance_schema_max_file_instances 10000
+performance_schema_max_index_stat 5000
+performance_schema_max_memory_classes 320
+performance_schema_max_metadata_locks 10000
+performance_schema_max_mutex_classes 210
+performance_schema_max_mutex_instances 5000
+performance_schema_max_prepared_statements_instances 100
+performance_schema_max_program_instances 5000
+performance_schema_max_rwlock_classes 50
+performance_schema_max_rwlock_instances 5000
+performance_schema_max_socket_classes 10
+performance_schema_max_socket_instances 1000
+performance_schema_max_sql_text_length 1024
+performance_schema_max_stage_classes 150
+performance_schema_max_statement_classes 193
+performance_schema_max_statement_stack 10
+performance_schema_max_table_handles 1000
+performance_schema_max_table_instances 500
+performance_schema_max_table_lock_stat 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
+show global status like "performance_schema%";
+Variable_name Value
+Performance_schema_accounts_lost 0
+Performance_schema_cond_classes_lost 0
+Performance_schema_cond_instances_lost 0
+Performance_schema_digest_lost 0
+Performance_schema_file_classes_lost 0
+Performance_schema_file_handles_lost 0
+Performance_schema_file_instances_lost 0
+Performance_schema_hosts_lost 0
+Performance_schema_index_stat_lost 0
+Performance_schema_locker_lost 0
+Performance_schema_memory_classes_lost 0
+Performance_schema_metadata_lock_lost 0
+Performance_schema_mutex_classes_lost 0
+Performance_schema_mutex_instances_lost 0
+Performance_schema_nested_statement_lost 0
+Performance_schema_prepared_statements_lost 0
+Performance_schema_program_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
+Performance_schema_statement_classes_lost 0
+Performance_schema_table_handles_lost 0
+Performance_schema_table_instances_lost 0
+Performance_schema_table_lock_stat_lost 0
+Performance_schema_thread_classes_lost 0
+Performance_schema_thread_instances_lost 0
+Performance_schema_users_lost 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
"================== Step 1 =================="
call dump_thread();
username status
@@ -63,28 +157,20 @@ execute dump_waits_history;
event_name count(event_name) object_type object_schema object_name
execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
-TABLE test t1 NULL 0 0 0 0 0 0 0
TABLE test t1 index_b 0 0 0 0 0 0 0
TABLE test t1 index_cb 0 0 0 0 0 0 0
TABLE test t1 PRIMARY 0 0 0 0 0 0 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 0 0 0 0 0 0 0
TABLE test t3 index_b 0 0 0 0 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
TABLE test t3 PRIMARY 0 0 0 0 0 0 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 0 0 0 0 0 0 0
-TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 0 0 0 0 0 0 0
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 0 0 0 0 0 0 0 0 0 0 0
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 0 0 0 0 0 0 0 0 0 0
+TABLE test t3 0 0 0 0 0 0 0 0 0 0
execute dump_objects_summary;
object_type object_schema object_name count_star
TABLE test t1 0
@@ -126,28 +212,20 @@ execute dump_waits_history;
event_name count(event_name) object_type object_schema object_name
execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
-TABLE test t1 NULL 0 0 0 0 0 0 0
TABLE test t1 index_b 0 0 0 0 0 0 0
TABLE test t1 index_cb 0 0 0 0 0 0 0
TABLE test t1 PRIMARY 0 0 0 0 0 0 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 0 0 0 0 0 0 0
TABLE test t3 index_b 0 0 0 0 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
TABLE test t3 PRIMARY 0 0 0 0 0 0 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 0 0 0 0 0 0 0
-TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 0 0 0 0 0 0 0
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 0 0 0 0 0 0 0 0 0 0 0
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 0 0 0 0 0 0 0 0 0 0
+TABLE test t3 0 0 0 0 0 0 0 0 0 0
execute dump_objects_summary;
object_type object_schema object_name count_star
TABLE test t1 0
@@ -178,19 +256,28 @@ update test.t3 set d=d+1;
update test.t1 set d=d+1 where a=101;
update test.t2 set d=d+1 where a=101;
update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
a b c d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
a b c d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
a b c d
105 5 5 1
+<<<<<<< HEAD
connection default;
"================== Step 3 =================="
call dump_thread();
username event_name count_star
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 24
+=======
+"================== con1 marker =================="
+"================== Step 3-A =================="
+call dump_thread();
+username event_name count_star
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
username status
user2 not found
username status
@@ -199,6 +286,7 @@ username status
user4 not found
execute dump_waits_account;
user host event_name count_star
+<<<<<<< HEAD
user1 localhost wait/io/table/sql/handler 25
user1 localhost wait/lock/table/sql/handler 24
execute dump_waits_user;
@@ -222,33 +310,122 @@ wait/lock/table/sql/handler 14 TABLE test t3
execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 6 4 2 4 1 1 0
+=======
+user1 localhost wait/io/table/sql/handler 22
+user1 localhost wait/lock/table/sql/handler 12
+execute dump_waits_user;
+user event_name count_star
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 12
+execute dump_waits_host;
+host event_name count_star
+localhost wait/io/table/sql/handler 22
+localhost wait/lock/table/sql/handler 12
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 22
+wait/lock/table/sql/handler 12
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 7 TABLE test t1
+wait/lock/table/sql/handler 5 TABLE test t1
+wait/io/table/sql/handler 15 TABLE test t3
+wait/lock/table/sql/handler 7 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 4 3 1 3 1 0 0
TABLE test t1 index_b 0 0 0 0 0 0 0
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 2 1 1 1 0 1 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 14 8 6 8 3 3 0
-TABLE test t3 index_b 2 2 0 2 0 0 0
+TABLE test t1 PRIMARY 3 1 2 1 0 2 0
+TABLE test t3 NULL 10 7 3 7 3 0 0
+TABLE test t3 index_b 1 1 0 1 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 1 1 0 1 0 0 0
+TABLE test t3 PRIMARY 4 1 3 1 0 3 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 7 4 3 4 1 2 0
+TABLE test t3 15 9 6 9 3 3 0
+execute dump_waits_table_lock;
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 5 2 3 0 0 0 0 2 0 3
+TABLE test t3 7 2 5 0 0 0 0 2 0 5
+execute dump_objects_summary;
+object_type object_schema object_name count_star
+TABLE test t1 12
+TABLE test t2 0
+TABLE test t3 22
+flush tables;
+"================== con1 FLUSH =================="
+"================== Step 3-B =================="
+call dump_thread();
+username event_name count_star
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 12
+username status
+user2 not found
+username status
+user3 not found
+username status
+user4 not found
+execute dump_waits_account;
+user host event_name count_star
+user1 localhost wait/io/table/sql/handler 22
+user1 localhost wait/lock/table/sql/handler 12
+execute dump_waits_user;
+user event_name count_star
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 12
+execute dump_waits_host;
+host event_name count_star
+localhost wait/io/table/sql/handler 22
+localhost wait/lock/table/sql/handler 12
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 22
+wait/lock/table/sql/handler 12
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 7 TABLE test t1
+wait/lock/table/sql/handler 5 TABLE test t1
+wait/io/table/sql/handler 15 TABLE test t3
+wait/lock/table/sql/handler 7 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 4 3 1 3 1 0 0
+>>>>>>> merge-perfschema-5.7
+TABLE test t1 index_b 0 0 0 0 0 0 0
+TABLE test t1 index_cb 0 0 0 0 0 0 0
+TABLE test t1 PRIMARY 3 1 2 1 0 2 0
+TABLE test t3 NULL 10 7 3 7 3 0 0
+TABLE test t3 index_b 1 1 0 1 0 0 0
+TABLE test t3 index_cb 0 0 0 0 0 0 0
+TABLE test t3 PRIMARY 4 1 3 1 0 3 0
+execute dump_waits_table_io;
+object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 8 5 3 5 1 2 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 17 11 6 11 3 3 0
+=======
+TABLE test t1 7 4 3 4 1 2 0
+TABLE test t3 15 9 6 9 3 3 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 10 4 6 2 0 0 0 2 0 0 3
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 14 4 10 2 0 0 0 2 0 0 5
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 5 2 3 0 0 0 0 2 0 3
+TABLE test t3 7 2 5 0 0 0 0 2 0 5
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 18
TABLE test t2 0
TABLE test t3 31
connect con2, localhost, user2, , ;
+=======
+TABLE test t1 12
+TABLE test t2 0
+TABLE test t3 22
+>>>>>>> merge-perfschema-5.7
select concat(current_user(), " is connected") as status;
status
user2@localhost is connected
@@ -256,8 +433,13 @@ connection default;
"================== Step 4 =================="
call dump_thread();
username event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 24
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
username event_name count_star
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
@@ -267,18 +449,29 @@ username status
user4 not found
execute dump_waits_account;
user host event_name count_star
+<<<<<<< HEAD
user1 localhost wait/io/table/sql/handler 25
user1 localhost wait/lock/table/sql/handler 24
+=======
+user1 localhost wait/io/table/sql/handler 22
+user1 localhost wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
user2 localhost wait/io/table/sql/handler 0
user2 localhost wait/lock/table/sql/handler 0
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 24
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/table/sql/handler 25
localhost wait/lock/table/sql/handler 24
execute dump_waits_global;
@@ -294,33 +487,56 @@ wait/lock/table/sql/handler 14 TABLE test t3
execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 6 4 2 4 1 1 0
+=======
+localhost wait/io/table/sql/handler 22
+localhost wait/lock/table/sql/handler 12
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 22
+wait/lock/table/sql/handler 12
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 7 TABLE test t1
+wait/lock/table/sql/handler 5 TABLE test t1
+wait/io/table/sql/handler 15 TABLE test t3
+wait/lock/table/sql/handler 7 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 4 3 1 3 1 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_b 0 0 0 0 0 0 0
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 2 1 1 1 0 1 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 14 8 6 8 3 3 0
-TABLE test t3 index_b 2 2 0 2 0 0 0
+TABLE test t1 PRIMARY 3 1 2 1 0 2 0
+TABLE test t3 NULL 10 7 3 7 3 0 0
+TABLE test t3 index_b 1 1 0 1 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 1 1 0 1 0 0 0
+TABLE test t3 PRIMARY 4 1 3 1 0 3 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 8 5 3 5 1 2 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 17 11 6 11 3 3 0
+=======
+TABLE test t1 7 4 3 4 1 2 0
+TABLE test t3 15 9 6 9 3 3 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 10 4 6 2 0 0 0 2 0 0 3
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 14 4 10 2 0 0 0 2 0 0 5
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 5 2 3 0 0 0 0 2 0 3
+TABLE test t3 7 2 5 0 0 0 0 2 0 5
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 18
TABLE test t2 0
TABLE test t3 31
connection con2;
+=======
+TABLE test t1 12
+TABLE test t2 0
+TABLE test t3 22
+>>>>>>> merge-perfschema-5.7
insert into test.t1 set a=201, b=1, c=1;
insert into test.t2 set a=202, b=2, c=2;
insert into test.t2 set a=203, b=3, c=3;
@@ -351,11 +567,11 @@ update test.t3 set d=d+1;
update test.t1 set d=d+1 where a=201;
update test.t2 set d=d+1 where a=201;
update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
a b c d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
a b c d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
a b c d
105 5 5 2
205 5 5 1
@@ -363,8 +579,13 @@ connection default;
"================== Step 5 =================="
call dump_thread();
username event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 24
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
username event_name count_star
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
@@ -374,18 +595,29 @@ username status
user4 not found
execute dump_waits_account;
user host event_name count_star
+<<<<<<< HEAD
user1 localhost wait/io/table/sql/handler 25
user1 localhost wait/lock/table/sql/handler 24
+=======
+user1 localhost wait/io/table/sql/handler 22
+user1 localhost wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
user2 localhost wait/io/table/sql/handler 0
user2 localhost wait/lock/table/sql/handler 0
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 24
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/table/sql/handler 25
localhost wait/lock/table/sql/handler 24
execute dump_waits_global;
@@ -401,33 +633,56 @@ wait/lock/table/sql/handler 14 TABLE test t3
execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 6 4 2 4 1 1 0
+=======
+localhost wait/io/table/sql/handler 22
+localhost wait/lock/table/sql/handler 12
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 22
+wait/lock/table/sql/handler 12
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 7 TABLE test t1
+wait/lock/table/sql/handler 5 TABLE test t1
+wait/io/table/sql/handler 15 TABLE test t3
+wait/lock/table/sql/handler 7 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 4 3 1 3 1 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_b 0 0 0 0 0 0 0
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 2 1 1 1 0 1 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 14 8 6 8 3 3 0
-TABLE test t3 index_b 2 2 0 2 0 0 0
+TABLE test t1 PRIMARY 3 1 2 1 0 2 0
+TABLE test t3 NULL 10 7 3 7 3 0 0
+TABLE test t3 index_b 1 1 0 1 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 1 1 0 1 0 0 0
+TABLE test t3 PRIMARY 4 1 3 1 0 3 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 8 5 3 5 1 2 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 17 11 6 11 3 3 0
+=======
+TABLE test t1 7 4 3 4 1 2 0
+TABLE test t3 15 9 6 9 3 3 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 10 4 6 2 0 0 0 2 0 0 3
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 14 4 10 2 0 0 0 2 0 0 5
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 5 2 3 0 0 0 0 2 0 3
+TABLE test t3 7 2 5 0 0 0 0 2 0 5
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 18
TABLE test t2 0
TABLE test t3 31
connect con3, localhost, user3, , ;
+=======
+TABLE test t1 12
+TABLE test t2 0
+TABLE test t3 22
+>>>>>>> merge-perfschema-5.7
select concat(current_user(), " is connected") as status;
status
user3@localhost is connected
@@ -435,8 +690,13 @@ connection default;
"================== Step 6 =================="
call dump_thread();
username event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 24
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
username event_name count_star
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
@@ -447,22 +707,33 @@ username status
user4 not found
execute dump_waits_account;
user host event_name count_star
+<<<<<<< HEAD
user1 localhost wait/io/table/sql/handler 25
user1 localhost wait/lock/table/sql/handler 24
+=======
+user1 localhost wait/io/table/sql/handler 22
+user1 localhost wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
user2 localhost wait/io/table/sql/handler 0
user2 localhost wait/lock/table/sql/handler 0
user3 localhost wait/io/table/sql/handler 0
user3 localhost wait/lock/table/sql/handler 0
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 24
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
user3 wait/io/table/sql/handler 0
user3 wait/lock/table/sql/handler 0
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/table/sql/handler 25
localhost wait/lock/table/sql/handler 24
execute dump_waits_global;
@@ -478,33 +749,56 @@ wait/lock/table/sql/handler 14 TABLE test t3
execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 6 4 2 4 1 1 0
+=======
+localhost wait/io/table/sql/handler 22
+localhost wait/lock/table/sql/handler 12
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 22
+wait/lock/table/sql/handler 12
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 7 TABLE test t1
+wait/lock/table/sql/handler 5 TABLE test t1
+wait/io/table/sql/handler 15 TABLE test t3
+wait/lock/table/sql/handler 7 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 4 3 1 3 1 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_b 0 0 0 0 0 0 0
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 2 1 1 1 0 1 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 14 8 6 8 3 3 0
-TABLE test t3 index_b 2 2 0 2 0 0 0
+TABLE test t1 PRIMARY 3 1 2 1 0 2 0
+TABLE test t3 NULL 10 7 3 7 3 0 0
+TABLE test t3 index_b 1 1 0 1 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 1 1 0 1 0 0 0
+TABLE test t3 PRIMARY 4 1 3 1 0 3 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 8 5 3 5 1 2 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 17 11 6 11 3 3 0
+=======
+TABLE test t1 7 4 3 4 1 2 0
+TABLE test t3 15 9 6 9 3 3 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 10 4 6 2 0 0 0 2 0 0 3
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 14 4 10 2 0 0 0 2 0 0 5
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 5 2 3 0 0 0 0 2 0 3
+TABLE test t3 7 2 5 0 0 0 0 2 0 5
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 18
TABLE test t2 0
TABLE test t3 31
connection con3;
+=======
+TABLE test t1 12
+TABLE test t2 0
+TABLE test t3 22
+>>>>>>> merge-perfschema-5.7
insert into test.t1 set a=301, b=1, c=1;
insert into test.t2 set a=302, b=2, c=2;
insert into test.t2 set a=303, b=3, c=3;
@@ -541,11 +835,11 @@ update test.t3 set d=d+1;
update test.t1 set d=d+1 where a=301;
update test.t2 set d=d+1 where a=301;
update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
a b c d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
a b c d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
a b c d
105 5 5 3
205 5 5 2
@@ -554,34 +848,50 @@ connection default;
"================== Step 7 =================="
call dump_thread();
username event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 24
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
username event_name count_star
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
username event_name count_star
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
username status
user4 not found
execute dump_waits_account;
user host event_name count_star
+<<<<<<< HEAD
user1 localhost wait/io/table/sql/handler 25
user1 localhost wait/lock/table/sql/handler 24
+=======
+user1 localhost wait/io/table/sql/handler 22
+user1 localhost wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
user2 localhost wait/io/table/sql/handler 0
user2 localhost wait/lock/table/sql/handler 0
-user3 localhost wait/io/table/sql/handler 52
-user3 localhost wait/lock/table/sql/handler 24
+user3 localhost wait/io/table/sql/handler 48
+user3 localhost wait/lock/table/sql/handler 12
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 24
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/table/sql/handler 77
localhost wait/lock/table/sql/handler 48
execute dump_waits_global;
@@ -598,32 +908,56 @@ execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 18 12 6 12 2 4 0
TABLE test t1 index_b 1 1 0 1 0 0 0
+=======
+localhost wait/io/table/sql/handler 70
+localhost wait/lock/table/sql/handler 24
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 70
+wait/lock/table/sql/handler 24
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 20 TABLE test t1
+wait/lock/table/sql/handler 10 TABLE test t1
+wait/io/table/sql/handler 50 TABLE test t3
+wait/lock/table/sql/handler 14 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 12 10 2 10 2 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 4 2 2 2 0 2 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 46 28 18 28 6 12 0
-TABLE test t3 index_b 6 6 0 6 0 0 0
+TABLE test t1 PRIMARY 8 2 6 2 0 6 0
+TABLE test t3 NULL 32 26 6 26 6 0 0
+TABLE test t3 index_b 4 4 0 4 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 2 2 0 2 0 0 0
+TABLE test t3 PRIMARY 14 2 12 2 0 12 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 23 15 8 15 2 6 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 54 36 18 36 6 12 0
+=======
+TABLE test t1 20 12 8 12 2 6 0
+TABLE test t3 50 32 18 32 6 12 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 20 8 12 4 0 0 0 4 0 0 6
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 28 8 20 4 0 0 0 4 0 0 10
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 10 4 6 0 0 0 0 4 0 6
+TABLE test t3 14 4 10 0 0 0 0 4 0 10
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 43
TABLE test t2 0
TABLE test t3 82
connect con4, localhost, user4, , ;
+=======
+TABLE test t1 30
+TABLE test t2 0
+TABLE test t3 64
+>>>>>>> merge-perfschema-5.7
select concat(current_user(), " is connected") as status;
status
user4@localhost is connected
@@ -631,39 +965,55 @@ connection default;
"================== Step 8 =================="
call dump_thread();
username event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 24
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
username event_name count_star
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
username event_name count_star
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
username event_name count_star
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_account;
user host event_name count_star
+<<<<<<< HEAD
user1 localhost wait/io/table/sql/handler 25
user1 localhost wait/lock/table/sql/handler 24
+=======
+user1 localhost wait/io/table/sql/handler 22
+user1 localhost wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
user2 localhost wait/io/table/sql/handler 0
user2 localhost wait/lock/table/sql/handler 0
-user3 localhost wait/io/table/sql/handler 52
-user3 localhost wait/lock/table/sql/handler 24
+user3 localhost wait/io/table/sql/handler 48
+user3 localhost wait/lock/table/sql/handler 12
user4 localhost wait/io/table/sql/handler 0
user4 localhost wait/lock/table/sql/handler 0
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 24
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/table/sql/handler 77
localhost wait/lock/table/sql/handler 48
execute dump_waits_global;
@@ -680,32 +1030,56 @@ execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 18 12 6 12 2 4 0
TABLE test t1 index_b 1 1 0 1 0 0 0
+=======
+localhost wait/io/table/sql/handler 70
+localhost wait/lock/table/sql/handler 24
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 70
+wait/lock/table/sql/handler 24
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 20 TABLE test t1
+wait/lock/table/sql/handler 10 TABLE test t1
+wait/io/table/sql/handler 50 TABLE test t3
+wait/lock/table/sql/handler 14 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 12 10 2 10 2 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 4 2 2 2 0 2 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 46 28 18 28 6 12 0
-TABLE test t3 index_b 6 6 0 6 0 0 0
+TABLE test t1 PRIMARY 8 2 6 2 0 6 0
+TABLE test t3 NULL 32 26 6 26 6 0 0
+TABLE test t3 index_b 4 4 0 4 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 2 2 0 2 0 0 0
+TABLE test t3 PRIMARY 14 2 12 2 0 12 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 23 15 8 15 2 6 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 54 36 18 36 6 12 0
+=======
+TABLE test t1 20 12 8 12 2 6 0
+TABLE test t3 50 32 18 32 6 12 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 20 8 12 4 0 0 0 4 0 0 6
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 28 8 20 4 0 0 0 4 0 0 10
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 10 4 6 0 0 0 0 4 0 6
+TABLE test t3 14 4 10 0 0 0 0 4 0 10
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 43
TABLE test t2 0
TABLE test t3 82
connection con4;
+=======
+TABLE test t1 30
+TABLE test t2 0
+TABLE test t3 64
+>>>>>>> merge-perfschema-5.7
insert into test.t1 set a=401, b=1, c=1;
insert into test.t2 set a=402, b=2, c=2;
insert into test.t2 set a=403, b=3, c=3;
@@ -748,11 +1122,11 @@ update test.t3 set d=d+1;
update test.t1 set d=d+1 where a=401;
update test.t2 set d=d+1 where a=401;
update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
a b c d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
a b c d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
a b c d
105 5 5 4
205 5 5 3
@@ -762,39 +1136,55 @@ connection default;
"================== Step 9 =================="
call dump_thread();
username event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 24
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
username event_name count_star
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
username event_name count_star
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
username event_name count_star
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_account;
user host event_name count_star
+<<<<<<< HEAD
user1 localhost wait/io/table/sql/handler 25
user1 localhost wait/lock/table/sql/handler 24
+=======
+user1 localhost wait/io/table/sql/handler 22
+user1 localhost wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
user2 localhost wait/io/table/sql/handler 0
user2 localhost wait/lock/table/sql/handler 0
-user3 localhost wait/io/table/sql/handler 52
-user3 localhost wait/lock/table/sql/handler 24
+user3 localhost wait/io/table/sql/handler 48
+user3 localhost wait/lock/table/sql/handler 12
user4 localhost wait/io/table/sql/handler 0
user4 localhost wait/lock/table/sql/handler 0
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 24
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 12
+>>>>>>> merge-perfschema-5.7
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/table/sql/handler 77
localhost wait/lock/table/sql/handler 48
execute dump_waits_global;
@@ -811,32 +1201,56 @@ execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 18 12 6 12 2 4 0
TABLE test t1 index_b 1 1 0 1 0 0 0
+=======
+localhost wait/io/table/sql/handler 70
+localhost wait/lock/table/sql/handler 24
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 70
+wait/lock/table/sql/handler 24
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 20 TABLE test t1
+wait/lock/table/sql/handler 10 TABLE test t1
+wait/io/table/sql/handler 50 TABLE test t3
+wait/lock/table/sql/handler 14 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 12 10 2 10 2 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 4 2 2 2 0 2 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 46 28 18 28 6 12 0
-TABLE test t3 index_b 6 6 0 6 0 0 0
+TABLE test t1 PRIMARY 8 2 6 2 0 6 0
+TABLE test t3 NULL 32 26 6 26 6 0 0
+TABLE test t3 index_b 4 4 0 4 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 2 2 0 2 0 0 0
+TABLE test t3 PRIMARY 14 2 12 2 0 12 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 23 15 8 15 2 6 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 54 36 18 36 6 12 0
+=======
+TABLE test t1 20 12 8 12 2 6 0
+TABLE test t3 50 32 18 32 6 12 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 20 8 12 4 0 0 0 4 0 0 6
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 28 8 20 4 0 0 0 4 0 0 10
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 10 4 6 0 0 0 0 4 0 6
+TABLE test t3 14 4 10 0 0 0 0 4 0 10
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 43
TABLE test t2 0
TABLE test t3 82
connection con1;
+=======
+TABLE test t1 30
+TABLE test t2 0
+TABLE test t3 64
+>>>>>>> merge-perfschema-5.7
lock tables test.t1 read, test.t2 read, test.t3 read;
unlock tables;
lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -845,39 +1259,55 @@ connection default;
"================== Step 10 =================="
call dump_thread();
username event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 32
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
username event_name count_star
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
username event_name count_star
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
username event_name count_star
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_account;
user host event_name count_star
+<<<<<<< HEAD
user1 localhost wait/io/table/sql/handler 25
user1 localhost wait/lock/table/sql/handler 32
+=======
+user1 localhost wait/io/table/sql/handler 22
+user1 localhost wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 localhost wait/io/table/sql/handler 0
user2 localhost wait/lock/table/sql/handler 0
-user3 localhost wait/io/table/sql/handler 52
-user3 localhost wait/lock/table/sql/handler 24
+user3 localhost wait/io/table/sql/handler 48
+user3 localhost wait/lock/table/sql/handler 12
user4 localhost wait/io/table/sql/handler 0
user4 localhost wait/lock/table/sql/handler 0
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 32
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/table/sql/handler 77
localhost wait/lock/table/sql/handler 56
execute dump_waits_global;
@@ -894,70 +1324,110 @@ execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 18 12 6 12 2 4 0
TABLE test t1 index_b 1 1 0 1 0 0 0
+=======
+localhost wait/io/table/sql/handler 70
+localhost wait/lock/table/sql/handler 28
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 70
+wait/lock/table/sql/handler 28
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 20 TABLE test t1
+wait/lock/table/sql/handler 12 TABLE test t1
+wait/io/table/sql/handler 50 TABLE test t3
+wait/lock/table/sql/handler 16 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 12 10 2 10 2 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 4 2 2 2 0 2 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 46 28 18 28 6 12 0
-TABLE test t3 index_b 6 6 0 6 0 0 0
+TABLE test t1 PRIMARY 8 2 6 2 0 6 0
+TABLE test t3 NULL 32 26 6 26 6 0 0
+TABLE test t3 index_b 4 4 0 4 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 2 2 0 2 0 0 0
+TABLE test t3 PRIMARY 14 2 12 2 0 12 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 23 15 8 15 2 6 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 54 36 18 36 6 12 0
+=======
+TABLE test t1 20 12 8 12 2 6 0
+TABLE test t3 50 32 18 32 6 12 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 24 10 14 4 0 0 1 5 0 0 7
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 32 10 22 4 0 0 1 5 0 0 11
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 12 5 7 0 0 0 0 5 0 7
+TABLE test t3 16 5 11 0 0 0 0 5 0 11
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 47
TABLE test t2 0
TABLE test t3 86
connection default;
+=======
+TABLE test t1 32
+TABLE test t2 0
+TABLE test t3 66
+>>>>>>> merge-perfschema-5.7
flush tables;
"================== flush marker =================="
"================== Step 11 =================="
call dump_thread();
username event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 32
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
username event_name count_star
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
username event_name count_star
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
username event_name count_star
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_account;
user host event_name count_star
+<<<<<<< HEAD
user1 localhost wait/io/table/sql/handler 25
user1 localhost wait/lock/table/sql/handler 32
+=======
+user1 localhost wait/io/table/sql/handler 22
+user1 localhost wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 localhost wait/io/table/sql/handler 0
user2 localhost wait/lock/table/sql/handler 0
-user3 localhost wait/io/table/sql/handler 52
-user3 localhost wait/lock/table/sql/handler 24
+user3 localhost wait/io/table/sql/handler 48
+user3 localhost wait/lock/table/sql/handler 12
user4 localhost wait/io/table/sql/handler 0
user4 localhost wait/lock/table/sql/handler 0
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 32
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/table/sql/handler 77
localhost wait/lock/table/sql/handler 56
execute dump_waits_global;
@@ -974,70 +1444,108 @@ execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 18 12 6 12 2 4 0
TABLE test t1 index_b 1 1 0 1 0 0 0
+=======
+localhost wait/io/table/sql/handler 70
+localhost wait/lock/table/sql/handler 28
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 70
+wait/lock/table/sql/handler 28
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 20 TABLE test t1
+wait/lock/table/sql/handler 12 TABLE test t1
+wait/io/table/sql/handler 50 TABLE test t3
+wait/lock/table/sql/handler 16 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 12 10 2 10 2 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 4 2 2 2 0 2 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 46 28 18 28 6 12 0
-TABLE test t3 index_b 6 6 0 6 0 0 0
+TABLE test t1 PRIMARY 8 2 6 2 0 6 0
+TABLE test t3 NULL 32 26 6 26 6 0 0
+TABLE test t3 index_b 4 4 0 4 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 2 2 0 2 0 0 0
+TABLE test t3 PRIMARY 14 2 12 2 0 12 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 23 15 8 15 2 6 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 54 36 18 36 6 12 0
+=======
+TABLE test t1 20 12 8 12 2 6 0
+TABLE test t3 50 32 18 32 6 12 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 24 10 14 4 0 0 1 5 0 0 7
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 32 10 22 4 0 0 1 5 0 0 11
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 12 5 7 0 0 0 0 5 0 7
+TABLE test t3 16 5 11 0 0 0 0 5 0 11
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 47
+=======
+TABLE test t1 32
+>>>>>>> merge-perfschema-5.7
TABLE test t2 0
-TABLE test t3 86
+TABLE test t3 66
set global read_only=1;
set global read_only=0;
"================== global read_only marker =================="
"================== Step 12 =================="
call dump_thread();
username event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 32
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
username event_name count_star
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
username event_name count_star
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
username event_name count_star
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_account;
user host event_name count_star
+<<<<<<< HEAD
user1 localhost wait/io/table/sql/handler 25
user1 localhost wait/lock/table/sql/handler 32
+=======
+user1 localhost wait/io/table/sql/handler 22
+user1 localhost wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 localhost wait/io/table/sql/handler 0
user2 localhost wait/lock/table/sql/handler 0
-user3 localhost wait/io/table/sql/handler 52
-user3 localhost wait/lock/table/sql/handler 24
+user3 localhost wait/io/table/sql/handler 48
+user3 localhost wait/lock/table/sql/handler 12
user4 localhost wait/io/table/sql/handler 0
user4 localhost wait/lock/table/sql/handler 0
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 32
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/table/sql/handler 77
localhost wait/lock/table/sql/handler 56
execute dump_waits_global;
@@ -1054,32 +1562,57 @@ execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 18 12 6 12 2 4 0
TABLE test t1 index_b 1 1 0 1 0 0 0
+=======
+localhost wait/io/table/sql/handler 70
+localhost wait/lock/table/sql/handler 28
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 70
+wait/lock/table/sql/handler 28
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 20 TABLE test t1
+wait/lock/table/sql/handler 12 TABLE test t1
+wait/io/table/sql/handler 50 TABLE test t3
+wait/lock/table/sql/handler 16 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 12 10 2 10 2 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 4 2 2 2 0 2 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 46 28 18 28 6 12 0
-TABLE test t3 index_b 6 6 0 6 0 0 0
+TABLE test t1 PRIMARY 8 2 6 2 0 6 0
+TABLE test t3 NULL 32 26 6 26 6 0 0
+TABLE test t3 index_b 4 4 0 4 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 2 2 0 2 0 0 0
+TABLE test t3 PRIMARY 14 2 12 2 0 12 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 23 15 8 15 2 6 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 54 36 18 36 6 12 0
+=======
+TABLE test t1 20 12 8 12 2 6 0
+TABLE test t3 50 32 18 32 6 12 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 24 10 14 4 0 0 1 5 0 0 7
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 32 10 22 4 0 0 1 5 0 0 11
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 12 5 7 0 0 0 0 5 0 7
+TABLE test t3 16 5 11 0 0 0 0 5 0 11
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 47
TABLE test t2 0
TABLE test t3 86
disconnect con1;
+=======
+TABLE test t1 32
+TABLE test t2 0
+TABLE test t3 66
+"================== con1 disconnected =================="
+>>>>>>> merge-perfschema-5.7
"================== Step 13 =================="
call dump_thread();
username status
@@ -1088,33 +1621,44 @@ username event_name count_star
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
username event_name count_star
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
username event_name count_star
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_account;
user host event_name count_star
+<<<<<<< HEAD
user1 localhost wait/io/table/sql/handler 25
user1 localhost wait/lock/table/sql/handler 32
+=======
+user1 localhost wait/io/table/sql/handler 22
+user1 localhost wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 localhost wait/io/table/sql/handler 0
user2 localhost wait/lock/table/sql/handler 0
-user3 localhost wait/io/table/sql/handler 52
-user3 localhost wait/lock/table/sql/handler 24
+user3 localhost wait/io/table/sql/handler 48
+user3 localhost wait/lock/table/sql/handler 12
user4 localhost wait/io/table/sql/handler 0
user4 localhost wait/lock/table/sql/handler 0
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 32
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/table/sql/handler 77
localhost wait/lock/table/sql/handler 56
execute dump_waits_global;
@@ -1131,32 +1675,57 @@ execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 18 12 6 12 2 4 0
TABLE test t1 index_b 1 1 0 1 0 0 0
+=======
+localhost wait/io/table/sql/handler 70
+localhost wait/lock/table/sql/handler 28
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 70
+wait/lock/table/sql/handler 28
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 20 TABLE test t1
+wait/lock/table/sql/handler 12 TABLE test t1
+wait/io/table/sql/handler 50 TABLE test t3
+wait/lock/table/sql/handler 16 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 12 10 2 10 2 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 4 2 2 2 0 2 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 46 28 18 28 6 12 0
-TABLE test t3 index_b 6 6 0 6 0 0 0
+TABLE test t1 PRIMARY 8 2 6 2 0 6 0
+TABLE test t3 NULL 32 26 6 26 6 0 0
+TABLE test t3 index_b 4 4 0 4 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 2 2 0 2 0 0 0
+TABLE test t3 PRIMARY 14 2 12 2 0 12 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 23 15 8 15 2 6 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 54 36 18 36 6 12 0
+=======
+TABLE test t1 20 12 8 12 2 6 0
+TABLE test t3 50 32 18 32 6 12 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 24 10 14 4 0 0 1 5 0 0 7
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 32 10 22 4 0 0 1 5 0 0 11
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 12 5 7 0 0 0 0 5 0 7
+TABLE test t3 16 5 11 0 0 0 0 5 0 11
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 47
TABLE test t2 0
TABLE test t3 86
disconnect con2;
+=======
+TABLE test t1 32
+TABLE test t2 0
+TABLE test t3 66
+"================== con2 disconnected =================="
+>>>>>>> merge-perfschema-5.7
"================== Step 14 =================="
call dump_thread();
username status
@@ -1164,33 +1733,44 @@ user1 not found
username status
user2 not found
username event_name count_star
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
username event_name count_star
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_account;
user host event_name count_star
+<<<<<<< HEAD
user1 localhost wait/io/table/sql/handler 25
user1 localhost wait/lock/table/sql/handler 32
+=======
+user1 localhost wait/io/table/sql/handler 22
+user1 localhost wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 localhost wait/io/table/sql/handler 0
user2 localhost wait/lock/table/sql/handler 0
-user3 localhost wait/io/table/sql/handler 52
-user3 localhost wait/lock/table/sql/handler 24
+user3 localhost wait/io/table/sql/handler 48
+user3 localhost wait/lock/table/sql/handler 12
user4 localhost wait/io/table/sql/handler 0
user4 localhost wait/lock/table/sql/handler 0
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 32
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/table/sql/handler 77
localhost wait/lock/table/sql/handler 56
execute dump_waits_global;
@@ -1207,32 +1787,57 @@ execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 18 12 6 12 2 4 0
TABLE test t1 index_b 1 1 0 1 0 0 0
+=======
+localhost wait/io/table/sql/handler 70
+localhost wait/lock/table/sql/handler 28
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 70
+wait/lock/table/sql/handler 28
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 20 TABLE test t1
+wait/lock/table/sql/handler 12 TABLE test t1
+wait/io/table/sql/handler 50 TABLE test t3
+wait/lock/table/sql/handler 16 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 12 10 2 10 2 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 4 2 2 2 0 2 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 46 28 18 28 6 12 0
-TABLE test t3 index_b 6 6 0 6 0 0 0
+TABLE test t1 PRIMARY 8 2 6 2 0 6 0
+TABLE test t3 NULL 32 26 6 26 6 0 0
+TABLE test t3 index_b 4 4 0 4 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 2 2 0 2 0 0 0
+TABLE test t3 PRIMARY 14 2 12 2 0 12 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 23 15 8 15 2 6 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 54 36 18 36 6 12 0
+=======
+TABLE test t1 20 12 8 12 2 6 0
+TABLE test t3 50 32 18 32 6 12 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 24 10 14 4 0 0 1 5 0 0 7
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 32 10 22 4 0 0 1 5 0 0 11
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 12 5 7 0 0 0 0 5 0 7
+TABLE test t3 16 5 11 0 0 0 0 5 0 11
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 47
TABLE test t2 0
TABLE test t3 86
disconnect con3;
+=======
+TABLE test t1 32
+TABLE test t2 0
+TABLE test t3 66
+"================== con3 disconnected =================="
+>>>>>>> merge-perfschema-5.7
"================== Step 15 =================="
call dump_thread();
username status
@@ -1246,26 +1851,37 @@ user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_account;
user host event_name count_star
+<<<<<<< HEAD
user1 localhost wait/io/table/sql/handler 25
user1 localhost wait/lock/table/sql/handler 32
+=======
+user1 localhost wait/io/table/sql/handler 22
+user1 localhost wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 localhost wait/io/table/sql/handler 0
user2 localhost wait/lock/table/sql/handler 0
-user3 localhost wait/io/table/sql/handler 52
-user3 localhost wait/lock/table/sql/handler 24
+user3 localhost wait/io/table/sql/handler 48
+user3 localhost wait/lock/table/sql/handler 12
user4 localhost wait/io/table/sql/handler 0
user4 localhost wait/lock/table/sql/handler 0
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 32
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/table/sql/handler 77
localhost wait/lock/table/sql/handler 56
execute dump_waits_global;
@@ -1282,32 +1898,57 @@ execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 18 12 6 12 2 4 0
TABLE test t1 index_b 1 1 0 1 0 0 0
+=======
+localhost wait/io/table/sql/handler 70
+localhost wait/lock/table/sql/handler 28
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 70
+wait/lock/table/sql/handler 28
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 20 TABLE test t1
+wait/lock/table/sql/handler 12 TABLE test t1
+wait/io/table/sql/handler 50 TABLE test t3
+wait/lock/table/sql/handler 16 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 12 10 2 10 2 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 4 2 2 2 0 2 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 46 28 18 28 6 12 0
-TABLE test t3 index_b 6 6 0 6 0 0 0
+TABLE test t1 PRIMARY 8 2 6 2 0 6 0
+TABLE test t3 NULL 32 26 6 26 6 0 0
+TABLE test t3 index_b 4 4 0 4 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 2 2 0 2 0 0 0
+TABLE test t3 PRIMARY 14 2 12 2 0 12 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 23 15 8 15 2 6 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 54 36 18 36 6 12 0
+=======
+TABLE test t1 20 12 8 12 2 6 0
+TABLE test t3 50 32 18 32 6 12 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 24 10 14 4 0 0 1 5 0 0 7
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 32 10 22 4 0 0 1 5 0 0 11
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 12 5 7 0 0 0 0 5 0 7
+TABLE test t3 16 5 11 0 0 0 0 5 0 11
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 47
TABLE test t2 0
TABLE test t3 86
disconnect con4;
+=======
+TABLE test t1 32
+TABLE test t2 0
+TABLE test t3 66
+"================== con4 disconnected =================="
+>>>>>>> merge-perfschema-5.7
"================== Step 16 =================="
call dump_thread();
username status
@@ -1320,26 +1961,37 @@ username status
user4 not found
execute dump_waits_account;
user host event_name count_star
+<<<<<<< HEAD
user1 localhost wait/io/table/sql/handler 25
user1 localhost wait/lock/table/sql/handler 32
+=======
+user1 localhost wait/io/table/sql/handler 22
+user1 localhost wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 localhost wait/io/table/sql/handler 0
user2 localhost wait/lock/table/sql/handler 0
-user3 localhost wait/io/table/sql/handler 52
-user3 localhost wait/lock/table/sql/handler 24
+user3 localhost wait/io/table/sql/handler 48
+user3 localhost wait/lock/table/sql/handler 12
user4 localhost wait/io/table/sql/handler 0
user4 localhost wait/lock/table/sql/handler 0
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 32
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/table/sql/handler 77
localhost wait/lock/table/sql/handler 56
execute dump_waits_global;
@@ -1356,32 +2008,56 @@ execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 18 12 6 12 2 4 0
TABLE test t1 index_b 1 1 0 1 0 0 0
+=======
+localhost wait/io/table/sql/handler 70
+localhost wait/lock/table/sql/handler 28
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 70
+wait/lock/table/sql/handler 28
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 20 TABLE test t1
+wait/lock/table/sql/handler 12 TABLE test t1
+wait/io/table/sql/handler 50 TABLE test t3
+wait/lock/table/sql/handler 16 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 12 10 2 10 2 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 4 2 2 2 0 2 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 46 28 18 28 6 12 0
-TABLE test t3 index_b 6 6 0 6 0 0 0
+TABLE test t1 PRIMARY 8 2 6 2 0 6 0
+TABLE test t3 NULL 32 26 6 26 6 0 0
+TABLE test t3 index_b 4 4 0 4 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 2 2 0 2 0 0 0
+TABLE test t3 PRIMARY 14 2 12 2 0 12 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 23 15 8 15 2 6 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 54 36 18 36 6 12 0
+=======
+TABLE test t1 20 12 8 12 2 6 0
+TABLE test t3 50 32 18 32 6 12 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 24 10 14 4 0 0 1 5 0 0 7
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 32 10 22 4 0 0 1 5 0 0 11
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 12 5 7 0 0 0 0 5 0 7
+TABLE test t3 16 5 11 0 0 0 0 5 0 11
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 47
TABLE test t2 0
TABLE test t3 86
connection default;
+=======
+TABLE test t1 32
+TABLE test t2 0
+TABLE test t3 66
+>>>>>>> merge-perfschema-5.7
truncate performance_schema.events_waits_summary_by_thread_by_event_name;
"================== BY_THREAD truncated =================="
"================== Step 17 =================="
@@ -1396,26 +2072,37 @@ username status
user4 not found
execute dump_waits_account;
user host event_name count_star
+<<<<<<< HEAD
user1 localhost wait/io/table/sql/handler 25
user1 localhost wait/lock/table/sql/handler 32
+=======
+user1 localhost wait/io/table/sql/handler 22
+user1 localhost wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 localhost wait/io/table/sql/handler 0
user2 localhost wait/lock/table/sql/handler 0
-user3 localhost wait/io/table/sql/handler 52
-user3 localhost wait/lock/table/sql/handler 24
+user3 localhost wait/io/table/sql/handler 48
+user3 localhost wait/lock/table/sql/handler 12
user4 localhost wait/io/table/sql/handler 0
user4 localhost wait/lock/table/sql/handler 0
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 32
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/table/sql/handler 77
localhost wait/lock/table/sql/handler 56
execute dump_waits_global;
@@ -1432,31 +2119,53 @@ execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 18 12 6 12 2 4 0
TABLE test t1 index_b 1 1 0 1 0 0 0
+=======
+localhost wait/io/table/sql/handler 70
+localhost wait/lock/table/sql/handler 28
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 70
+wait/lock/table/sql/handler 28
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 20 TABLE test t1
+wait/lock/table/sql/handler 12 TABLE test t1
+wait/io/table/sql/handler 50 TABLE test t3
+wait/lock/table/sql/handler 16 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 12 10 2 10 2 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 4 2 2 2 0 2 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 46 28 18 28 6 12 0
-TABLE test t3 index_b 6 6 0 6 0 0 0
+TABLE test t1 PRIMARY 8 2 6 2 0 6 0
+TABLE test t3 NULL 32 26 6 26 6 0 0
+TABLE test t3 index_b 4 4 0 4 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 2 2 0 2 0 0 0
+TABLE test t3 PRIMARY 14 2 12 2 0 12 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 23 15 8 15 2 6 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 54 36 18 36 6 12 0
+=======
+TABLE test t1 20 12 8 12 2 6 0
+TABLE test t3 50 32 18 32 6 12 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 24 10 14 4 0 0 1 5 0 0 7
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 32 10 22 4 0 0 1 5 0 0 11
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 12 5 7 0 0 0 0 5 0 7
+TABLE test t3 16 5 11 0 0 0 0 5 0 11
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 47
+=======
+TABLE test t1 32
+>>>>>>> merge-perfschema-5.7
TABLE test t2 0
-TABLE test t3 86
+TABLE test t3 66
truncate performance_schema.events_waits_summary_by_account_by_event_name;
"================== BY_ACCOUNT truncated =================="
"================== Step 18 =================="
@@ -1481,16 +2190,22 @@ user4 localhost wait/io/table/sql/handler 0
user4 localhost wait/lock/table/sql/handler 0
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/table/sql/handler 25
user1 wait/lock/table/sql/handler 32
+=======
+user1 wait/io/table/sql/handler 22
+user1 wait/lock/table/sql/handler 16
+>>>>>>> merge-perfschema-5.7
user2 wait/io/table/sql/handler 0
user2 wait/lock/table/sql/handler 0
-user3 wait/io/table/sql/handler 52
-user3 wait/lock/table/sql/handler 24
+user3 wait/io/table/sql/handler 48
+user3 wait/lock/table/sql/handler 12
user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/table/sql/handler 77
localhost wait/lock/table/sql/handler 56
execute dump_waits_global;
@@ -1507,31 +2222,53 @@ execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 18 12 6 12 2 4 0
TABLE test t1 index_b 1 1 0 1 0 0 0
+=======
+localhost wait/io/table/sql/handler 70
+localhost wait/lock/table/sql/handler 28
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 70
+wait/lock/table/sql/handler 28
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 20 TABLE test t1
+wait/lock/table/sql/handler 12 TABLE test t1
+wait/io/table/sql/handler 50 TABLE test t3
+wait/lock/table/sql/handler 16 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 12 10 2 10 2 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 4 2 2 2 0 2 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 46 28 18 28 6 12 0
-TABLE test t3 index_b 6 6 0 6 0 0 0
+TABLE test t1 PRIMARY 8 2 6 2 0 6 0
+TABLE test t3 NULL 32 26 6 26 6 0 0
+TABLE test t3 index_b 4 4 0 4 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 2 2 0 2 0 0 0
+TABLE test t3 PRIMARY 14 2 12 2 0 12 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 23 15 8 15 2 6 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 54 36 18 36 6 12 0
+=======
+TABLE test t1 20 12 8 12 2 6 0
+TABLE test t3 50 32 18 32 6 12 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 24 10 14 4 0 0 1 5 0 0 7
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 32 10 22 4 0 0 1 5 0 0 11
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 12 5 7 0 0 0 0 5 0 7
+TABLE test t3 16 5 11 0 0 0 0 5 0 11
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 47
+=======
+TABLE test t1 32
+>>>>>>> merge-perfschema-5.7
TABLE test t2 0
-TABLE test t3 86
+TABLE test t3 66
truncate performance_schema.events_waits_summary_by_user_by_event_name;
"================== BY_USER truncated =================="
"================== Step 19 =================="
@@ -1566,6 +2303,7 @@ user4 wait/io/table/sql/handler 0
user4 wait/lock/table/sql/handler 0
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/table/sql/handler 77
localhost wait/lock/table/sql/handler 56
execute dump_waits_global;
@@ -1582,31 +2320,53 @@ execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 18 12 6 12 2 4 0
TABLE test t1 index_b 1 1 0 1 0 0 0
+=======
+localhost wait/io/table/sql/handler 70
+localhost wait/lock/table/sql/handler 28
+execute dump_waits_global;
+event_name count_star
+wait/io/table/sql/handler 70
+wait/lock/table/sql/handler 28
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 20 TABLE test t1
+wait/lock/table/sql/handler 12 TABLE test t1
+wait/io/table/sql/handler 50 TABLE test t3
+wait/lock/table/sql/handler 16 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 12 10 2 10 2 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 4 2 2 2 0 2 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 46 28 18 28 6 12 0
-TABLE test t3 index_b 6 6 0 6 0 0 0
+TABLE test t1 PRIMARY 8 2 6 2 0 6 0
+TABLE test t3 NULL 32 26 6 26 6 0 0
+TABLE test t3 index_b 4 4 0 4 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 2 2 0 2 0 0 0
+TABLE test t3 PRIMARY 14 2 12 2 0 12 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 23 15 8 15 2 6 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 54 36 18 36 6 12 0
+=======
+TABLE test t1 20 12 8 12 2 6 0
+TABLE test t3 50 32 18 32 6 12 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 24 10 14 4 0 0 1 5 0 0 7
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 32 10 22 4 0 0 1 5 0 0 11
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 12 5 7 0 0 0 0 5 0 7
+TABLE test t3 16 5 11 0 0 0 0 5 0 11
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 47
+=======
+TABLE test t1 32
+>>>>>>> merge-perfschema-5.7
TABLE test t2 0
-TABLE test t3 86
+TABLE test t3 66
truncate performance_schema.events_waits_summary_by_host_by_event_name;
"================== BY_HOST truncated =================="
"================== Step 21 =================="
@@ -1645,6 +2405,7 @@ localhost wait/io/table/sql/handler 0
localhost wait/lock/table/sql/handler 0
execute dump_waits_global;
event_name count_star
+<<<<<<< HEAD
wait/io/table/sql/handler 77
wait/lock/table/sql/handler 56
execute dump_waits_history;
@@ -1657,31 +2418,49 @@ execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 18 12 6 12 2 4 0
TABLE test t1 index_b 1 1 0 1 0 0 0
+=======
+wait/io/table/sql/handler 70
+wait/lock/table/sql/handler 28
+execute dump_waits_history;
+event_name count(event_name) object_type object_schema object_name
+wait/io/table/sql/handler 20 TABLE test t1
+wait/lock/table/sql/handler 12 TABLE test t1
+wait/io/table/sql/handler 50 TABLE test t3
+wait/lock/table/sql/handler 16 TABLE test t3
+execute dump_waits_index_io;
+object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 NULL 12 10 2 10 2 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 4 2 2 2 0 2 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 46 28 18 28 6 12 0
-TABLE test t3 index_b 6 6 0 6 0 0 0
+TABLE test t1 PRIMARY 8 2 6 2 0 6 0
+TABLE test t3 NULL 32 26 6 26 6 0 0
+TABLE test t3 index_b 4 4 0 4 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 2 2 0 2 0 0 0
+TABLE test t3 PRIMARY 14 2 12 2 0 12 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 23 15 8 15 2 6 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 54 36 18 36 6 12 0
+=======
+TABLE test t1 20 12 8 12 2 6 0
+TABLE test t3 50 32 18 32 6 12 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 24 10 14 4 0 0 1 5 0 0 7
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 32 10 22 4 0 0 1 5 0 0 11
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 12 5 7 0 0 0 0 5 0 7
+TABLE test t3 16 5 11 0 0 0 0 5 0 11
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 47
+=======
+TABLE test t1 32
+>>>>>>> merge-perfschema-5.7
TABLE test t2 0
-TABLE test t3 86
+TABLE test t3 66
truncate performance_schema.events_waits_summary_global_by_event_name;
"================== GLOBAL truncated =================="
"================== Step 21 =================="
@@ -1724,20 +2503,23 @@ wait/io/table/sql/handler 0
wait/lock/table/sql/handler 0
execute dump_waits_history;
event_name count(event_name) object_type object_schema object_name
+<<<<<<< HEAD
wait/io/table/sql/handler 23 TABLE test t1
wait/lock/table/sql/handler 24 TABLE test t1
wait/io/table/sql/handler 54 TABLE test t3
wait/lock/table/sql/handler 32 TABLE test t3
+=======
+wait/io/table/sql/handler 20 TABLE test t1
+wait/lock/table/sql/handler 12 TABLE test t1
+wait/io/table/sql/handler 50 TABLE test t3
+wait/lock/table/sql/handler 16 TABLE test t3
+>>>>>>> merge-perfschema-5.7
execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 NULL 0 0 0 0 0 0 0
TABLE test t1 index_b 0 0 0 0 0 0 0
TABLE test t1 index_cb 0 0 0 0 0 0 0
TABLE test t1 PRIMARY 0 0 0 0 0 0 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
TABLE test t3 NULL 0 0 0 0 0 0 0
TABLE test t3 index_b 0 0 0 0 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
@@ -1745,19 +2527,17 @@ TABLE test t3 PRIMARY 0 0 0 0 0 0 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 0 0 0 0 0 0 0
-TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 0 0 0 0 0 0 0
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 0 0 0 0 0 0 0 0 0 0 0
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 0 0 0 0 0 0 0 0 0 0
+TABLE test t3 0 0 0 0 0 0 0 0 0 0
execute dump_objects_summary;
object_type object_schema object_name count_star
TABLE test t1 0
TABLE test t2 0
TABLE test t3 0
-show status like "performance_schema%";
+show global status like "performance_schema%";
Variable_name Value
Performance_schema_accounts_lost 0
Performance_schema_cond_classes_lost 0
@@ -1767,9 +2547,15 @@ Performance_schema_file_classes_lost 0
Performance_schema_file_handles_lost 0
Performance_schema_file_instances_lost 0
Performance_schema_hosts_lost 0
+Performance_schema_index_stat_lost 0
Performance_schema_locker_lost 0
+Performance_schema_memory_classes_lost 0
+Performance_schema_metadata_lock_lost 0
Performance_schema_mutex_classes_lost 0
Performance_schema_mutex_instances_lost 0
+Performance_schema_nested_statement_lost 0
+Performance_schema_prepared_statements_lost 0
+Performance_schema_program_lost 0
Performance_schema_rwlock_classes_lost 0
Performance_schema_rwlock_instances_lost 0
Performance_schema_session_connect_attrs_lost 0
@@ -1779,6 +2565,7 @@ Performance_schema_stage_classes_lost 0
Performance_schema_statement_classes_lost 0
Performance_schema_table_handles_lost 0
Performance_schema_table_instances_lost 0
+Performance_schema_table_lock_stat_lost 0
Performance_schema_thread_classes_lost 0
Performance_schema_thread_instances_lost 0
Performance_schema_users_lost 0