diff options
author | Sergei Golubchik <serg@mariadb.org> | 2020-02-15 18:25:57 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-10 19:24:23 +0100 |
commit | 7af733a5a2cb7f79ffb5ff0129cad6db6f3cc359 (patch) | |
tree | f8f9cab2cd92e43b5fd20c9ac77f9487ece4e5a7 /mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result | |
parent | 81cffda2e68ea5a155b74f24ae4345388afa963c (diff) | |
download | mariadb-git-7af733a5a2cb7f79ffb5ff0129cad6db6f3cc359.tar.gz |
perfschema compilation, test and misc fixes
Diffstat (limited to 'mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result')
-rw-r--r-- | mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result | 1978 |
1 files changed, 483 insertions, 1495 deletions
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result index 50f81788dae..c2eda2b8f23 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result @@ -1,15 +1,3 @@ -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. select * from performance_schema.setup_actors order by USER, HOST, ROLE; HOST USER ROLE ENABLED HISTORY @@ -51,85 +39,6 @@ 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 @@ -272,21 +181,12 @@ a b c d 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 37 -user1 wait/lock/table/sql/handler 36 -======= -"================== con1 marker ==================" "================== Step 3-A ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 18 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 33 +user1 wait/lock/table/sql/handler 36 username status user2 not found username status @@ -295,104 +195,66 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 37 +user1 localhost wait/io/table/sql/handler 33 user1 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 37 +localhost wait/io/table/sql/handler 33 localhost wait/lock/table/sql/handler 36 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 37 +wait/io/table/sql/handler 33 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name wait/io/table/sql/handler 8 TABLE test t1 wait/lock/table/sql/handler 10 TABLE test t1 -wait/io/table/sql/handler 12 TABLE test t2 +wait/io/table/sql/handler 10 TABLE test t2 wait/lock/table/sql/handler 12 TABLE test t2 -wait/io/table/sql/handler 17 TABLE test t3 +wait/io/table/sql/handler 15 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 6 4 2 4 1 1 0 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 18 -execute dump_waits_user; -user event_name count_star -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 18 -execute dump_waits_host; -host event_name count_star -localhost wait/io/table/sql/handler 32 -localhost wait/lock/table/sql/handler 18 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 32 -wait/lock/table/sql/handler 18 -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 10 TABLE test t2 -wait/lock/table/sql/handler 6 TABLE test t2 -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 t2 NULL 7 5 2 5 2 0 0 +TABLE test t1 PRIMARY 2 1 1 1 0 1 0 +TABLE test t2 NULL 9 5 4 5 2 2 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 3 1 2 1 0 2 0 -TABLE test t3 NULL 10 7 3 7 3 0 0 +TABLE test t2 PRIMARY 1 1 0 1 0 0 0 +TABLE test t3 NULL 13 7 6 7 3 3 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 +TABLE test t3 PRIMARY 1 1 0 1 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 -<<<<<<< HEAD TABLE test t1 8 5 3 5 1 2 0 -TABLE test t2 12 8 4 8 2 2 0 -TABLE test t3 17 11 6 11 3 3 0 -======= -TABLE test t1 7 4 3 4 1 2 0 TABLE test t2 10 6 4 6 2 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_low_priority count_write_external -TABLE test t1 5 2 3 0 0 0 0 2 0 3 -TABLE test t2 6 2 4 0 0 0 0 2 0 4 -TABLE test t3 7 2 5 0 0 0 0 2 0 5 +TABLE test t1 10 4 6 2 0 0 0 2 0 3 +TABLE test t2 12 4 8 2 0 0 0 2 0 4 +TABLE test t3 14 4 10 2 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 24 -TABLE test t3 31 -connect con2, localhost, user2, , ; -======= -TABLE test t1 12 -TABLE test t2 16 -TABLE test t3 22 +TABLE test t2 22 +TABLE test t3 29 +connection con1; flush tables; "================== con1 FLUSH ==================" +connection default; "================== Step 3-B ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 18 +user1 wait/io/table/sql/handler 33 +user1 wait/lock/table/sql/handler 36 username status user2 not found username status @@ -401,58 +263,58 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 18 +user1 localhost wait/io/table/sql/handler 33 +user1 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 18 +user1 wait/io/table/sql/handler 33 +user1 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 32 -localhost wait/lock/table/sql/handler 18 +localhost wait/io/table/sql/handler 33 +localhost wait/lock/table/sql/handler 36 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 32 -wait/lock/table/sql/handler 18 +wait/io/table/sql/handler 33 +wait/lock/table/sql/handler 36 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 8 TABLE test t1 +wait/lock/table/sql/handler 10 TABLE test t1 wait/io/table/sql/handler 10 TABLE test t2 -wait/lock/table/sql/handler 6 TABLE test t2 +wait/lock/table/sql/handler 12 TABLE test t2 wait/io/table/sql/handler 15 TABLE test t3 -wait/lock/table/sql/handler 7 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 4 3 1 3 1 0 0 +TABLE test t1 NULL 6 4 2 4 1 1 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 3 1 2 1 0 2 0 -TABLE test t2 NULL 7 5 2 5 2 0 0 +TABLE test t1 PRIMARY 2 1 1 1 0 1 0 +TABLE test t2 NULL 9 5 4 5 2 2 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 3 1 2 1 0 2 0 -TABLE test t3 NULL 10 7 3 7 3 0 0 +TABLE test t2 PRIMARY 1 1 0 1 0 0 0 +TABLE test t3 NULL 13 7 6 7 3 3 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 +TABLE test t3 PRIMARY 1 1 0 1 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 7 4 3 4 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 10 6 4 6 2 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 t2 6 2 4 0 0 0 0 2 0 4 -TABLE test t3 7 2 5 0 0 0 0 2 0 5 +TABLE test t1 10 4 6 2 0 0 0 2 0 3 +TABLE test t2 12 4 8 2 0 0 0 2 0 4 +TABLE test t3 14 4 10 2 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 16 -TABLE test t3 22 ->>>>>>> merge-perfschema-5.7 +TABLE test t1 18 +TABLE test t2 22 +TABLE test t3 29 +connect con2, localhost, user2, , ; select concat(current_user(), " is connected") as status; status user2@localhost is connected @@ -460,13 +322,8 @@ connection default; "================== Step 4 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 36 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 18 ->>>>>>> merge-perfschema-5.7 username event_name count_star user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -476,104 +333,62 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 37 +user1 localhost wait/io/table/sql/handler 33 user1 localhost wait/lock/table/sql/handler 36 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 18 ->>>>>>> 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 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 36 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 18 ->>>>>>> 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 37 +localhost wait/io/table/sql/handler 33 localhost wait/lock/table/sql/handler 36 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 37 +wait/io/table/sql/handler 33 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name wait/io/table/sql/handler 8 TABLE test t1 wait/lock/table/sql/handler 10 TABLE test t1 -wait/io/table/sql/handler 12 TABLE test t2 +wait/io/table/sql/handler 10 TABLE test t2 wait/lock/table/sql/handler 12 TABLE test t2 -wait/io/table/sql/handler 17 TABLE test t3 +wait/io/table/sql/handler 15 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 6 4 2 4 1 1 0 -======= -localhost wait/io/table/sql/handler 32 -localhost wait/lock/table/sql/handler 18 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 32 -wait/lock/table/sql/handler 18 -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 10 TABLE test t2 -wait/lock/table/sql/handler 6 TABLE test t2 -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 t2 NULL 7 5 2 5 2 0 0 +TABLE test t1 PRIMARY 2 1 1 1 0 1 0 +TABLE test t2 NULL 9 5 4 5 2 2 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 3 1 2 1 0 2 0 -TABLE test t3 NULL 10 7 3 7 3 0 0 +TABLE test t2 PRIMARY 1 1 0 1 0 0 0 +TABLE test t3 NULL 13 7 6 7 3 3 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 +TABLE test t3 PRIMARY 1 1 0 1 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 -<<<<<<< HEAD TABLE test t1 8 5 3 5 1 2 0 -TABLE test t2 12 8 4 8 2 2 0 -TABLE test t3 17 11 6 11 3 3 0 -======= -TABLE test t1 7 4 3 4 1 2 0 TABLE test t2 10 6 4 6 2 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_low_priority count_write_external -TABLE test t1 5 2 3 0 0 0 0 2 0 3 -TABLE test t2 6 2 4 0 0 0 0 2 0 4 -TABLE test t3 7 2 5 0 0 0 0 2 0 5 +TABLE test t1 10 4 6 2 0 0 0 2 0 3 +TABLE test t2 12 4 8 2 0 0 0 2 0 4 +TABLE test t3 14 4 10 2 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 24 -TABLE test t3 31 +TABLE test t2 22 +TABLE test t3 29 connection con2; -======= -TABLE test t1 12 -TABLE test t2 16 -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; @@ -616,123 +431,73 @@ connection default; "================== Step 5 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 36 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 18 ->>>>>>> merge-perfschema-5.7 username event_name count_star user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 +user2 wait/lock/table/sql/handler 36 username status user3 not found username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 37 +user1 localhost wait/io/table/sql/handler 33 user1 localhost wait/lock/table/sql/handler 36 -user2 localhost wait/io/table/sql/handler 57 +user2 localhost wait/io/table/sql/handler 51 user2 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 36 -user2 wait/io/table/sql/handler 57 +user2 wait/io/table/sql/handler 51 user2 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 94 +localhost wait/io/table/sql/handler 84 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 94 +wait/io/table/sql/handler 84 wait/lock/table/sql/handler 72 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/io/table/sql/handler 18 TABLE test t1 wait/lock/table/sql/handler 20 TABLE test t1 -wait/io/table/sql/handler 30 TABLE test t2 -wait/lock/table/sql/handler 24 TABLE test t2 -wait/io/table/sql/handler 44 TABLE test t3 -wait/lock/table/sql/handler 28 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 15 10 5 10 2 3 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 18 -user2 localhost wait/io/table/sql/handler 51 -user2 localhost wait/lock/table/sql/handler 18 -execute dump_waits_user; -user event_name count_star -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 18 -user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 -execute dump_waits_host; -host event_name count_star -localhost wait/io/table/sql/handler 83 -localhost wait/lock/table/sql/handler 36 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 83 -wait/lock/table/sql/handler 36 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 17 TABLE test t1 -wait/lock/table/sql/handler 10 TABLE test t1 wait/io/table/sql/handler 26 TABLE test t2 -wait/lock/table/sql/handler 12 TABLE test t2 +wait/lock/table/sql/handler 24 TABLE test t2 wait/io/table/sql/handler 40 TABLE test t3 -wait/lock/table/sql/handler 14 TABLE test t3 +wait/lock/table/sql/handler 28 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 10 8 2 8 2 0 0 +TABLE test t1 NULL 14 9 5 9 2 3 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 7 2 5 2 0 5 0 -TABLE test t2 NULL 18 14 4 14 4 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 0 +TABLE test t2 NULL 24 14 10 14 4 6 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 8 2 6 2 0 6 0 -TABLE test t3 NULL 26 20 6 20 6 0 0 +TABLE test t2 PRIMARY 2 2 0 2 0 0 0 +TABLE test t3 NULL 35 20 15 20 6 9 0 TABLE test t3 index_b 3 3 0 3 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 11 2 9 2 0 9 0 +TABLE test t3 PRIMARY 2 2 0 2 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 -<<<<<<< HEAD -TABLE test t1 20 13 7 13 2 5 0 -TABLE test t2 30 20 10 20 4 6 0 -TABLE test t3 44 29 15 29 6 9 0 -======= -TABLE test t1 17 10 7 10 2 5 0 +TABLE test t1 18 11 7 11 2 5 0 TABLE test t2 26 16 10 16 4 6 0 TABLE test t3 40 25 15 25 6 9 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_low_priority count_write_external -TABLE test t1 10 4 6 0 0 0 0 4 0 6 -TABLE test t2 12 4 8 0 0 0 0 4 0 8 -TABLE test t3 14 4 10 0 0 0 0 4 0 10 +TABLE test t1 20 8 12 4 0 0 0 4 0 6 +TABLE test t2 24 8 16 4 0 0 0 4 0 8 +TABLE test t3 28 8 20 4 0 0 0 4 0 10 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 40 -TABLE test t2 54 -TABLE test t3 72 +TABLE test t1 38 +TABLE test t2 50 +TABLE test t3 68 connect con3, localhost, user3, , ; -======= -TABLE test t1 27 -TABLE test t2 38 -TABLE test t3 54 ->>>>>>> merge-perfschema-5.7 select concat(current_user(), " is connected") as status; status user3@localhost is connected @@ -740,16 +505,11 @@ connection default; "================== Step 6 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 36 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 18 ->>>>>>> merge-perfschema-5.7 username event_name count_star user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 +user2 wait/lock/table/sql/handler 36 username event_name count_star user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 @@ -757,113 +517,66 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 37 +user1 localhost wait/io/table/sql/handler 33 user1 localhost wait/lock/table/sql/handler 36 -user2 localhost wait/io/table/sql/handler 57 -user2 localhost wait/lock/table/sql/handler 36 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 18 user2 localhost wait/io/table/sql/handler 51 -user2 localhost wait/lock/table/sql/handler 18 ->>>>>>> merge-perfschema-5.7 +user2 localhost wait/lock/table/sql/handler 36 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 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 36 -user2 wait/io/table/sql/handler 57 -user2 wait/lock/table/sql/handler 36 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 18 user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 ->>>>>>> merge-perfschema-5.7 +user2 wait/lock/table/sql/handler 36 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 94 +localhost wait/io/table/sql/handler 84 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 94 +wait/io/table/sql/handler 84 wait/lock/table/sql/handler 72 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/io/table/sql/handler 18 TABLE test t1 wait/lock/table/sql/handler 20 TABLE test t1 -wait/io/table/sql/handler 30 TABLE test t2 -wait/lock/table/sql/handler 24 TABLE test t2 -wait/io/table/sql/handler 44 TABLE test t3 -wait/lock/table/sql/handler 28 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 15 10 5 10 2 3 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -localhost wait/io/table/sql/handler 83 -localhost wait/lock/table/sql/handler 36 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 83 -wait/lock/table/sql/handler 36 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 17 TABLE test t1 -wait/lock/table/sql/handler 10 TABLE test t1 wait/io/table/sql/handler 26 TABLE test t2 -wait/lock/table/sql/handler 12 TABLE test t2 +wait/lock/table/sql/handler 24 TABLE test t2 wait/io/table/sql/handler 40 TABLE test t3 -wait/lock/table/sql/handler 14 TABLE test t3 +wait/lock/table/sql/handler 28 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 10 8 2 8 2 0 0 +TABLE test t1 NULL 14 9 5 9 2 3 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 7 2 5 2 0 5 0 -TABLE test t2 NULL 18 14 4 14 4 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 0 +TABLE test t2 NULL 24 14 10 14 4 6 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 8 2 6 2 0 6 0 -TABLE test t3 NULL 26 20 6 20 6 0 0 +TABLE test t2 PRIMARY 2 2 0 2 0 0 0 +TABLE test t3 NULL 35 20 15 20 6 9 0 TABLE test t3 index_b 3 3 0 3 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 11 2 9 2 0 9 0 +TABLE test t3 PRIMARY 2 2 0 2 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 -<<<<<<< HEAD -TABLE test t1 20 13 7 13 2 5 0 -TABLE test t2 30 20 10 20 4 6 0 -TABLE test t3 44 29 15 29 6 9 0 -======= -TABLE test t1 17 10 7 10 2 5 0 +TABLE test t1 18 11 7 11 2 5 0 TABLE test t2 26 16 10 16 4 6 0 TABLE test t3 40 25 15 25 6 9 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_low_priority count_write_external -TABLE test t1 10 4 6 0 0 0 0 4 0 6 -TABLE test t2 12 4 8 0 0 0 0 4 0 8 -TABLE test t3 14 4 10 0 0 0 0 4 0 10 +TABLE test t1 20 8 12 4 0 0 0 4 0 6 +TABLE test t2 24 8 16 4 0 0 0 4 0 8 +TABLE test t3 28 8 20 4 0 0 0 4 0 10 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 40 -TABLE test t2 54 -TABLE test t3 72 +TABLE test t1 38 +TABLE test t2 50 +TABLE test t3 68 connection con3; -======= -TABLE test t1 27 -TABLE test t2 38 -TABLE test t3 54 ->>>>>>> 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; @@ -913,132 +626,78 @@ connection default; "================== Step 7 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 36 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 18 ->>>>>>> merge-perfschema-5.7 username event_name count_star user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 +user2 wait/lock/table/sql/handler 36 username event_name count_star user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +user3 wait/lock/table/sql/handler 36 username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 37 +user1 localhost wait/io/table/sql/handler 33 user1 localhost wait/lock/table/sql/handler 36 -user2 localhost wait/io/table/sql/handler 57 +user2 localhost wait/io/table/sql/handler 51 user2 localhost wait/lock/table/sql/handler 36 -user3 localhost wait/io/table/sql/handler 76 +user3 localhost wait/io/table/sql/handler 70 user3 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 36 -user2 wait/io/table/sql/handler 57 +user2 wait/io/table/sql/handler 51 user2 wait/lock/table/sql/handler 36 -user3 wait/io/table/sql/handler 76 +user3 wait/io/table/sql/handler 70 user3 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 170 +localhost wait/io/table/sql/handler 154 localhost wait/lock/table/sql/handler 108 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 170 +wait/io/table/sql/handler 154 wait/lock/table/sql/handler 108 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 35 TABLE test t1 +wait/io/table/sql/handler 31 TABLE test t1 wait/lock/table/sql/handler 30 TABLE test t1 -wait/io/table/sql/handler 54 TABLE test t2 -wait/lock/table/sql/handler 36 TABLE test t2 -wait/io/table/sql/handler 81 TABLE test t3 -wait/lock/table/sql/handler 42 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 27 18 9 18 3 6 0 -TABLE test t1 index_b 2 2 0 2 0 0 0 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 18 -user2 localhost wait/io/table/sql/handler 51 -user2 localhost wait/lock/table/sql/handler 18 -user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 -execute dump_waits_user; -user event_name count_star -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 18 -user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 -user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 -execute dump_waits_host; -host event_name count_star -localhost wait/io/table/sql/handler 153 -localhost wait/lock/table/sql/handler 54 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 153 -wait/lock/table/sql/handler 54 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 30 TABLE test t1 -wait/lock/table/sql/handler 15 TABLE test t1 wait/io/table/sql/handler 48 TABLE test t2 -wait/lock/table/sql/handler 18 TABLE test t2 +wait/lock/table/sql/handler 36 TABLE test t2 wait/io/table/sql/handler 75 TABLE test t3 -wait/lock/table/sql/handler 21 TABLE test t3 +wait/lock/table/sql/handler 42 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 18 15 3 15 3 0 0 +TABLE test t1 NULL 25 16 9 16 3 6 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 12 3 9 3 0 9 0 -TABLE test t2 NULL 33 27 6 27 6 0 0 +TABLE test t1 PRIMARY 6 3 3 3 0 3 0 +TABLE test t2 NULL 45 27 18 27 6 12 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 15 3 12 3 0 12 0 -TABLE test t3 NULL 48 39 9 39 9 0 0 +TABLE test t2 PRIMARY 3 3 0 3 0 0 0 +TABLE test t3 NULL 66 39 27 39 9 18 0 TABLE test t3 index_b 6 6 0 6 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 21 3 18 3 0 18 0 +TABLE test t3 PRIMARY 3 3 0 3 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 -<<<<<<< HEAD -TABLE test t1 35 23 12 23 3 9 0 -TABLE test t2 54 36 18 36 6 12 0 -TABLE test t3 81 54 27 54 9 18 0 -======= -TABLE test t1 30 18 12 18 3 9 0 +TABLE test t1 31 19 12 19 3 9 0 TABLE test t2 48 30 18 30 6 12 0 TABLE test t3 75 48 27 48 9 18 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_low_priority count_write_external -TABLE test t1 15 6 9 0 0 0 0 6 0 9 -TABLE test t2 18 6 12 0 0 0 0 6 0 12 -TABLE test t3 21 6 15 0 0 0 0 6 0 15 +TABLE test t1 30 12 18 6 0 0 0 6 0 9 +TABLE test t2 36 12 24 6 0 0 0 6 0 12 +TABLE test t3 42 12 30 6 0 0 0 6 0 15 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 65 -TABLE test t2 90 -TABLE test t3 123 +TABLE test t1 61 +TABLE test t2 84 +TABLE test t3 117 connect con4, localhost, user4, , ; -======= -TABLE test t1 45 -TABLE test t2 66 -TABLE test t3 96 ->>>>>>> merge-perfschema-5.7 select concat(current_user(), " is connected") as status; status user4@localhost is connected @@ -1046,139 +705,83 @@ connection default; "================== Step 8 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 36 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 18 ->>>>>>> merge-perfschema-5.7 username event_name count_star user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 +user2 wait/lock/table/sql/handler 36 username event_name count_star user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +user3 wait/lock/table/sql/handler 36 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 37 +user1 localhost wait/io/table/sql/handler 33 user1 localhost wait/lock/table/sql/handler 36 -user2 localhost wait/io/table/sql/handler 57 -user2 localhost wait/lock/table/sql/handler 36 -user3 localhost wait/io/table/sql/handler 76 -user3 localhost wait/lock/table/sql/handler 36 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 18 user2 localhost wait/io/table/sql/handler 51 -user2 localhost wait/lock/table/sql/handler 18 +user2 localhost wait/lock/table/sql/handler 36 user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 ->>>>>>> merge-perfschema-5.7 +user3 localhost wait/lock/table/sql/handler 36 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 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 36 -user2 wait/io/table/sql/handler 57 -user2 wait/lock/table/sql/handler 36 -user3 wait/io/table/sql/handler 76 -user3 wait/lock/table/sql/handler 36 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 18 user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 +user2 wait/lock/table/sql/handler 36 user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 ->>>>>>> merge-perfschema-5.7 +user3 wait/lock/table/sql/handler 36 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 170 +localhost wait/io/table/sql/handler 154 localhost wait/lock/table/sql/handler 108 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 170 +wait/io/table/sql/handler 154 wait/lock/table/sql/handler 108 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 35 TABLE test t1 +wait/io/table/sql/handler 31 TABLE test t1 wait/lock/table/sql/handler 30 TABLE test t1 -wait/io/table/sql/handler 54 TABLE test t2 -wait/lock/table/sql/handler 36 TABLE test t2 -wait/io/table/sql/handler 81 TABLE test t3 -wait/lock/table/sql/handler 42 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 27 18 9 18 3 6 0 -TABLE test t1 index_b 2 2 0 2 0 0 0 -======= -localhost wait/io/table/sql/handler 153 -localhost wait/lock/table/sql/handler 54 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 153 -wait/lock/table/sql/handler 54 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 30 TABLE test t1 -wait/lock/table/sql/handler 15 TABLE test t1 wait/io/table/sql/handler 48 TABLE test t2 -wait/lock/table/sql/handler 18 TABLE test t2 +wait/lock/table/sql/handler 36 TABLE test t2 wait/io/table/sql/handler 75 TABLE test t3 -wait/lock/table/sql/handler 21 TABLE test t3 +wait/lock/table/sql/handler 42 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 18 15 3 15 3 0 0 +TABLE test t1 NULL 25 16 9 16 3 6 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 12 3 9 3 0 9 0 -TABLE test t2 NULL 33 27 6 27 6 0 0 +TABLE test t1 PRIMARY 6 3 3 3 0 3 0 +TABLE test t2 NULL 45 27 18 27 6 12 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 15 3 12 3 0 12 0 -TABLE test t3 NULL 48 39 9 39 9 0 0 +TABLE test t2 PRIMARY 3 3 0 3 0 0 0 +TABLE test t3 NULL 66 39 27 39 9 18 0 TABLE test t3 index_b 6 6 0 6 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 21 3 18 3 0 18 0 +TABLE test t3 PRIMARY 3 3 0 3 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 -<<<<<<< HEAD -TABLE test t1 35 23 12 23 3 9 0 -TABLE test t2 54 36 18 36 6 12 0 -TABLE test t3 81 54 27 54 9 18 0 -======= -TABLE test t1 30 18 12 18 3 9 0 +TABLE test t1 31 19 12 19 3 9 0 TABLE test t2 48 30 18 30 6 12 0 TABLE test t3 75 48 27 48 9 18 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_low_priority count_write_external -TABLE test t1 15 6 9 0 0 0 0 6 0 9 -TABLE test t2 18 6 12 0 0 0 0 6 0 12 -TABLE test t3 21 6 15 0 0 0 0 6 0 15 +TABLE test t1 30 12 18 6 0 0 0 6 0 9 +TABLE test t2 36 12 24 6 0 0 0 6 0 12 +TABLE test t3 42 12 30 6 0 0 0 6 0 15 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 65 -TABLE test t2 90 -TABLE test t3 123 +TABLE test t1 61 +TABLE test t2 84 +TABLE test t3 117 connection con4; -======= -TABLE test t1 45 -TABLE test t2 66 -TABLE test t3 96 ->>>>>>> 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; @@ -1235,141 +838,83 @@ connection default; "================== Step 9 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 36 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 18 ->>>>>>> merge-perfschema-5.7 username event_name count_star user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 +user2 wait/lock/table/sql/handler 36 username event_name count_star user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +user3 wait/lock/table/sql/handler 36 username event_name count_star user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 +user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 37 +user1 localhost wait/io/table/sql/handler 33 user1 localhost wait/lock/table/sql/handler 36 -user2 localhost wait/io/table/sql/handler 57 +user2 localhost wait/io/table/sql/handler 51 user2 localhost wait/lock/table/sql/handler 36 -user3 localhost wait/io/table/sql/handler 76 +user3 localhost wait/io/table/sql/handler 70 user3 localhost wait/lock/table/sql/handler 36 -user4 localhost wait/io/table/sql/handler 95 +user4 localhost wait/io/table/sql/handler 89 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 36 -user2 wait/io/table/sql/handler 57 +user2 wait/io/table/sql/handler 51 user2 wait/lock/table/sql/handler 36 -user3 wait/io/table/sql/handler 76 +user3 wait/io/table/sql/handler 70 user3 wait/lock/table/sql/handler 36 -user4 wait/io/table/sql/handler 95 +user4 wait/io/table/sql/handler 89 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 265 +localhost wait/io/table/sql/handler 243 localhost wait/lock/table/sql/handler 144 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 265 +wait/io/table/sql/handler 243 wait/lock/table/sql/handler 144 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 53 TABLE test t1 +wait/io/table/sql/handler 47 TABLE test t1 wait/lock/table/sql/handler 40 TABLE test t1 -wait/io/table/sql/handler 84 TABLE test t2 -wait/lock/table/sql/handler 48 TABLE test t2 -wait/io/table/sql/handler 128 TABLE test t3 -wait/lock/table/sql/handler 56 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 42 28 14 28 4 10 0 -TABLE test t1 index_b 3 3 0 3 0 0 0 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 18 -user2 localhost wait/io/table/sql/handler 51 -user2 localhost wait/lock/table/sql/handler 18 -user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 -user4 localhost wait/io/table/sql/handler 89 -user4 localhost wait/lock/table/sql/handler 18 -execute dump_waits_user; -user event_name count_star -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 18 -user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 -user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 -user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 -execute dump_waits_host; -host event_name count_star -localhost wait/io/table/sql/handler 242 -localhost wait/lock/table/sql/handler 72 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 242 -wait/lock/table/sql/handler 72 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 46 TABLE test t1 -wait/lock/table/sql/handler 20 TABLE test t1 wait/io/table/sql/handler 76 TABLE test t2 -wait/lock/table/sql/handler 24 TABLE test t2 +wait/lock/table/sql/handler 48 TABLE test t2 wait/io/table/sql/handler 120 TABLE test t3 -wait/lock/table/sql/handler 28 TABLE test t3 +wait/lock/table/sql/handler 56 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 28 24 4 24 4 0 0 +TABLE test t1 NULL 39 25 14 25 4 10 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 18 4 14 4 0 14 0 -TABLE test t2 NULL 52 44 8 44 8 0 0 +TABLE test t1 PRIMARY 8 4 4 4 0 4 0 +TABLE test t2 NULL 72 44 28 44 8 20 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 24 4 20 4 0 20 0 -TABLE test t3 NULL 76 64 12 64 12 0 0 +TABLE test t2 PRIMARY 4 4 0 4 0 0 0 +TABLE test t3 NULL 106 64 42 64 12 30 0 TABLE test t3 index_b 10 10 0 10 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 34 4 30 4 0 30 0 +TABLE test t3 PRIMARY 4 4 0 4 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 -<<<<<<< HEAD -TABLE test t1 53 35 18 35 4 14 0 -TABLE test t2 84 56 28 56 8 20 0 -TABLE test t3 128 86 42 86 12 30 0 -======= -TABLE test t1 46 28 18 28 4 14 0 +TABLE test t1 47 29 18 29 4 14 0 TABLE test t2 76 48 28 48 8 20 0 TABLE test t3 120 78 42 78 12 30 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_low_priority count_write_external -TABLE test t1 20 8 12 0 0 0 0 8 0 12 -TABLE test t2 24 8 16 0 0 0 0 8 0 16 -TABLE test t3 28 8 20 0 0 0 0 8 0 20 +TABLE test t1 40 16 24 8 0 0 0 8 0 12 +TABLE test t2 48 16 32 8 0 0 0 8 0 16 +TABLE test t3 56 16 40 8 0 0 0 8 0 20 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 93 -TABLE test t2 132 -TABLE test t3 184 +TABLE test t1 87 +TABLE test t2 124 +TABLE test t3 176 connection con1; -======= -TABLE test t1 66 -TABLE test t2 100 -TABLE test t3 148 ->>>>>>> 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; @@ -1378,555 +923,326 @@ connection default; "================== Step 10 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 48 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 username event_name count_star user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 +user2 wait/lock/table/sql/handler 36 username event_name count_star user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +user3 wait/lock/table/sql/handler 36 username event_name count_star user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 +user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 37 +user1 localhost wait/io/table/sql/handler 33 user1 localhost wait/lock/table/sql/handler 48 -user2 localhost wait/io/table/sql/handler 57 +user2 localhost wait/io/table/sql/handler 51 user2 localhost wait/lock/table/sql/handler 36 -user3 localhost wait/io/table/sql/handler 76 +user3 localhost wait/io/table/sql/handler 70 user3 localhost wait/lock/table/sql/handler 36 -user4 localhost wait/io/table/sql/handler 95 +user4 localhost wait/io/table/sql/handler 89 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 48 -user2 wait/io/table/sql/handler 57 +user2 wait/io/table/sql/handler 51 user2 wait/lock/table/sql/handler 36 -user3 wait/io/table/sql/handler 76 +user3 wait/io/table/sql/handler 70 user3 wait/lock/table/sql/handler 36 -user4 wait/io/table/sql/handler 95 +user4 wait/io/table/sql/handler 89 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 265 +localhost wait/io/table/sql/handler 243 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 265 +wait/io/table/sql/handler 243 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 53 TABLE test t1 +wait/io/table/sql/handler 47 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 -wait/io/table/sql/handler 84 TABLE test t2 -wait/lock/table/sql/handler 52 TABLE test t2 -wait/io/table/sql/handler 128 TABLE test t3 -wait/lock/table/sql/handler 60 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 42 28 14 28 4 10 0 -TABLE test t1 index_b 3 3 0 3 0 0 0 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 24 -user2 localhost wait/io/table/sql/handler 51 -user2 localhost wait/lock/table/sql/handler 18 -user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 -user4 localhost wait/io/table/sql/handler 89 -user4 localhost wait/lock/table/sql/handler 18 -execute dump_waits_user; -user event_name count_star -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 -user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 -user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 -user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 -execute dump_waits_host; -host event_name count_star -localhost wait/io/table/sql/handler 242 -localhost wait/lock/table/sql/handler 78 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 242 -wait/lock/table/sql/handler 78 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 46 TABLE test t1 -wait/lock/table/sql/handler 22 TABLE test t1 wait/io/table/sql/handler 76 TABLE test t2 -wait/lock/table/sql/handler 26 TABLE test t2 +wait/lock/table/sql/handler 52 TABLE test t2 wait/io/table/sql/handler 120 TABLE test t3 -wait/lock/table/sql/handler 30 TABLE test t3 +wait/lock/table/sql/handler 60 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 28 24 4 24 4 0 0 +TABLE test t1 NULL 39 25 14 25 4 10 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 18 4 14 4 0 14 0 -TABLE test t2 NULL 52 44 8 44 8 0 0 +TABLE test t1 PRIMARY 8 4 4 4 0 4 0 +TABLE test t2 NULL 72 44 28 44 8 20 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 24 4 20 4 0 20 0 -TABLE test t3 NULL 76 64 12 64 12 0 0 +TABLE test t2 PRIMARY 4 4 0 4 0 0 0 +TABLE test t3 NULL 106 64 42 64 12 30 0 TABLE test t3 index_b 10 10 0 10 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 34 4 30 4 0 30 0 +TABLE test t3 PRIMARY 4 4 0 4 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 -<<<<<<< HEAD -TABLE test t1 53 35 18 35 4 14 0 -TABLE test t2 84 56 28 56 8 20 0 -TABLE test t3 128 86 42 86 12 30 0 -======= -TABLE test t1 46 28 18 28 4 14 0 +TABLE test t1 47 29 18 29 4 14 0 TABLE test t2 76 48 28 48 8 20 0 TABLE test t3 120 78 42 78 12 30 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_low_priority count_write_external -TABLE test t1 22 9 13 0 0 0 0 9 0 13 -TABLE test t2 26 9 17 0 0 0 0 9 0 17 -TABLE test t3 30 9 21 0 0 0 0 9 0 21 +TABLE test t1 44 18 26 8 0 0 1 9 0 13 +TABLE test t2 52 18 34 8 0 0 1 9 0 17 +TABLE test t3 60 18 42 8 0 0 1 9 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 97 -TABLE test t2 136 -TABLE test t3 188 +TABLE test t1 91 +TABLE test t2 128 +TABLE test t3 180 connection default; -======= -TABLE test t1 68 -TABLE test t2 102 -TABLE test t3 150 ->>>>>>> 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 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 48 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 username event_name count_star user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 +user2 wait/lock/table/sql/handler 36 username event_name count_star user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +user3 wait/lock/table/sql/handler 36 username event_name count_star user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 +user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 37 +user1 localhost wait/io/table/sql/handler 33 user1 localhost wait/lock/table/sql/handler 48 -user2 localhost wait/io/table/sql/handler 57 +user2 localhost wait/io/table/sql/handler 51 user2 localhost wait/lock/table/sql/handler 36 -user3 localhost wait/io/table/sql/handler 76 +user3 localhost wait/io/table/sql/handler 70 user3 localhost wait/lock/table/sql/handler 36 -user4 localhost wait/io/table/sql/handler 95 +user4 localhost wait/io/table/sql/handler 89 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 48 -user2 wait/io/table/sql/handler 57 +user2 wait/io/table/sql/handler 51 user2 wait/lock/table/sql/handler 36 -user3 wait/io/table/sql/handler 76 +user3 wait/io/table/sql/handler 70 user3 wait/lock/table/sql/handler 36 -user4 wait/io/table/sql/handler 95 +user4 wait/io/table/sql/handler 89 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 265 +localhost wait/io/table/sql/handler 243 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 265 +wait/io/table/sql/handler 243 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 53 TABLE test t1 +wait/io/table/sql/handler 47 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 -wait/io/table/sql/handler 84 TABLE test t2 -wait/lock/table/sql/handler 52 TABLE test t2 -wait/io/table/sql/handler 128 TABLE test t3 -wait/lock/table/sql/handler 60 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 42 28 14 28 4 10 0 -TABLE test t1 index_b 3 3 0 3 0 0 0 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 24 -user2 localhost wait/io/table/sql/handler 51 -user2 localhost wait/lock/table/sql/handler 18 -user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 -user4 localhost wait/io/table/sql/handler 89 -user4 localhost wait/lock/table/sql/handler 18 -execute dump_waits_user; -user event_name count_star -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 -user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 -user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 -user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 -execute dump_waits_host; -host event_name count_star -localhost wait/io/table/sql/handler 242 -localhost wait/lock/table/sql/handler 78 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 242 -wait/lock/table/sql/handler 78 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 46 TABLE test t1 -wait/lock/table/sql/handler 22 TABLE test t1 wait/io/table/sql/handler 76 TABLE test t2 -wait/lock/table/sql/handler 26 TABLE test t2 +wait/lock/table/sql/handler 52 TABLE test t2 wait/io/table/sql/handler 120 TABLE test t3 -wait/lock/table/sql/handler 30 TABLE test t3 +wait/lock/table/sql/handler 60 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 28 24 4 24 4 0 0 +TABLE test t1 NULL 39 25 14 25 4 10 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 18 4 14 4 0 14 0 -TABLE test t2 NULL 52 44 8 44 8 0 0 +TABLE test t1 PRIMARY 8 4 4 4 0 4 0 +TABLE test t2 NULL 72 44 28 44 8 20 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 24 4 20 4 0 20 0 -TABLE test t3 NULL 76 64 12 64 12 0 0 +TABLE test t2 PRIMARY 4 4 0 4 0 0 0 +TABLE test t3 NULL 106 64 42 64 12 30 0 TABLE test t3 index_b 10 10 0 10 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 34 4 30 4 0 30 0 +TABLE test t3 PRIMARY 4 4 0 4 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 -<<<<<<< HEAD -TABLE test t1 53 35 18 35 4 14 0 -TABLE test t2 84 56 28 56 8 20 0 -TABLE test t3 128 86 42 86 12 30 0 -======= -TABLE test t1 46 28 18 28 4 14 0 +TABLE test t1 47 29 18 29 4 14 0 TABLE test t2 76 48 28 48 8 20 0 TABLE test t3 120 78 42 78 12 30 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_low_priority count_write_external -TABLE test t1 22 9 13 0 0 0 0 9 0 13 -TABLE test t2 26 9 17 0 0 0 0 9 0 17 -TABLE test t3 30 9 21 0 0 0 0 9 0 21 +TABLE test t1 44 18 26 8 0 0 1 9 0 13 +TABLE test t2 52 18 34 8 0 0 1 9 0 17 +TABLE test t3 60 18 42 8 0 0 1 9 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 97 -TABLE test t2 136 -TABLE test t3 188 -======= -TABLE test t1 68 -TABLE test t2 102 -TABLE test t3 150 ->>>>>>> merge-perfschema-5.7 +TABLE test t1 91 +TABLE test t2 128 +TABLE test t3 180 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 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 48 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 username event_name count_star user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 +user2 wait/lock/table/sql/handler 36 username event_name count_star user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +user3 wait/lock/table/sql/handler 36 username event_name count_star user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 +user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 37 +user1 localhost wait/io/table/sql/handler 33 user1 localhost wait/lock/table/sql/handler 48 -user2 localhost wait/io/table/sql/handler 57 +user2 localhost wait/io/table/sql/handler 51 user2 localhost wait/lock/table/sql/handler 36 -user3 localhost wait/io/table/sql/handler 76 +user3 localhost wait/io/table/sql/handler 70 user3 localhost wait/lock/table/sql/handler 36 -user4 localhost wait/io/table/sql/handler 95 +user4 localhost wait/io/table/sql/handler 89 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 48 -user2 wait/io/table/sql/handler 57 +user2 wait/io/table/sql/handler 51 user2 wait/lock/table/sql/handler 36 -user3 wait/io/table/sql/handler 76 +user3 wait/io/table/sql/handler 70 user3 wait/lock/table/sql/handler 36 -user4 wait/io/table/sql/handler 95 +user4 wait/io/table/sql/handler 89 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 265 +localhost wait/io/table/sql/handler 243 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 265 +wait/io/table/sql/handler 243 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 53 TABLE test t1 +wait/io/table/sql/handler 47 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 -wait/io/table/sql/handler 84 TABLE test t2 -wait/lock/table/sql/handler 52 TABLE test t2 -wait/io/table/sql/handler 128 TABLE test t3 -wait/lock/table/sql/handler 60 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 42 28 14 28 4 10 0 -TABLE test t1 index_b 3 3 0 3 0 0 0 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 24 -user2 localhost wait/io/table/sql/handler 51 -user2 localhost wait/lock/table/sql/handler 18 -user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 -user4 localhost wait/io/table/sql/handler 89 -user4 localhost wait/lock/table/sql/handler 18 -execute dump_waits_user; -user event_name count_star -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 -user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 -user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 -user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 -execute dump_waits_host; -host event_name count_star -localhost wait/io/table/sql/handler 242 -localhost wait/lock/table/sql/handler 78 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 242 -wait/lock/table/sql/handler 78 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 46 TABLE test t1 -wait/lock/table/sql/handler 22 TABLE test t1 wait/io/table/sql/handler 76 TABLE test t2 -wait/lock/table/sql/handler 26 TABLE test t2 +wait/lock/table/sql/handler 52 TABLE test t2 wait/io/table/sql/handler 120 TABLE test t3 -wait/lock/table/sql/handler 30 TABLE test t3 +wait/lock/table/sql/handler 60 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 28 24 4 24 4 0 0 +TABLE test t1 NULL 39 25 14 25 4 10 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 18 4 14 4 0 14 0 -TABLE test t2 NULL 52 44 8 44 8 0 0 +TABLE test t1 PRIMARY 8 4 4 4 0 4 0 +TABLE test t2 NULL 72 44 28 44 8 20 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 24 4 20 4 0 20 0 -TABLE test t3 NULL 76 64 12 64 12 0 0 +TABLE test t2 PRIMARY 4 4 0 4 0 0 0 +TABLE test t3 NULL 106 64 42 64 12 30 0 TABLE test t3 index_b 10 10 0 10 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 34 4 30 4 0 30 0 +TABLE test t3 PRIMARY 4 4 0 4 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 -<<<<<<< HEAD -TABLE test t1 53 35 18 35 4 14 0 -TABLE test t2 84 56 28 56 8 20 0 -TABLE test t3 128 86 42 86 12 30 0 -======= -TABLE test t1 46 28 18 28 4 14 0 +TABLE test t1 47 29 18 29 4 14 0 TABLE test t2 76 48 28 48 8 20 0 TABLE test t3 120 78 42 78 12 30 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_low_priority count_write_external -TABLE test t1 22 9 13 0 0 0 0 9 0 13 -TABLE test t2 26 9 17 0 0 0 0 9 0 17 -TABLE test t3 30 9 21 0 0 0 0 9 0 21 +TABLE test t1 44 18 26 8 0 0 1 9 0 13 +TABLE test t2 52 18 34 8 0 0 1 9 0 17 +TABLE test t3 60 18 42 8 0 0 1 9 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 97 -TABLE test t2 136 -TABLE test t3 188 +TABLE test t1 91 +TABLE test t2 128 +TABLE test t3 180 disconnect con1; -======= -TABLE test t1 68 -TABLE test t2 102 -TABLE test t3 150 -"================== con1 disconnected ==================" ->>>>>>> merge-perfschema-5.7 "================== Step 13 ==================" call dump_thread(); username status user1 not found username event_name count_star user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 +user2 wait/lock/table/sql/handler 36 username event_name count_star user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +user3 wait/lock/table/sql/handler 36 username event_name count_star user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 +user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 37 +user1 localhost wait/io/table/sql/handler 33 user1 localhost wait/lock/table/sql/handler 48 -user2 localhost wait/io/table/sql/handler 57 +user2 localhost wait/io/table/sql/handler 51 user2 localhost wait/lock/table/sql/handler 36 -user3 localhost wait/io/table/sql/handler 76 +user3 localhost wait/io/table/sql/handler 70 user3 localhost wait/lock/table/sql/handler 36 -user4 localhost wait/io/table/sql/handler 95 +user4 localhost wait/io/table/sql/handler 89 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 48 -user2 wait/io/table/sql/handler 57 +user2 wait/io/table/sql/handler 51 user2 wait/lock/table/sql/handler 36 -user3 wait/io/table/sql/handler 76 +user3 wait/io/table/sql/handler 70 user3 wait/lock/table/sql/handler 36 -user4 wait/io/table/sql/handler 95 +user4 wait/io/table/sql/handler 89 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 265 +localhost wait/io/table/sql/handler 243 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 265 +wait/io/table/sql/handler 243 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 53 TABLE test t1 +wait/io/table/sql/handler 47 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 -wait/io/table/sql/handler 84 TABLE test t2 -wait/lock/table/sql/handler 52 TABLE test t2 -wait/io/table/sql/handler 128 TABLE test t3 -wait/lock/table/sql/handler 60 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 42 28 14 28 4 10 0 -TABLE test t1 index_b 3 3 0 3 0 0 0 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 24 -user2 localhost wait/io/table/sql/handler 51 -user2 localhost wait/lock/table/sql/handler 18 -user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 -user4 localhost wait/io/table/sql/handler 89 -user4 localhost wait/lock/table/sql/handler 18 -execute dump_waits_user; -user event_name count_star -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 -user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 -user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 -user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 -execute dump_waits_host; -host event_name count_star -localhost wait/io/table/sql/handler 242 -localhost wait/lock/table/sql/handler 78 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 242 -wait/lock/table/sql/handler 78 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 46 TABLE test t1 -wait/lock/table/sql/handler 22 TABLE test t1 wait/io/table/sql/handler 76 TABLE test t2 -wait/lock/table/sql/handler 26 TABLE test t2 +wait/lock/table/sql/handler 52 TABLE test t2 wait/io/table/sql/handler 120 TABLE test t3 -wait/lock/table/sql/handler 30 TABLE test t3 +wait/lock/table/sql/handler 60 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 28 24 4 24 4 0 0 +TABLE test t1 NULL 39 25 14 25 4 10 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 18 4 14 4 0 14 0 -TABLE test t2 NULL 52 44 8 44 8 0 0 +TABLE test t1 PRIMARY 8 4 4 4 0 4 0 +TABLE test t2 NULL 72 44 28 44 8 20 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 24 4 20 4 0 20 0 -TABLE test t3 NULL 76 64 12 64 12 0 0 +TABLE test t2 PRIMARY 4 4 0 4 0 0 0 +TABLE test t3 NULL 106 64 42 64 12 30 0 TABLE test t3 index_b 10 10 0 10 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 34 4 30 4 0 30 0 +TABLE test t3 PRIMARY 4 4 0 4 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 -<<<<<<< HEAD -TABLE test t1 53 35 18 35 4 14 0 -TABLE test t2 84 56 28 56 8 20 0 -TABLE test t3 128 86 42 86 12 30 0 -======= -TABLE test t1 46 28 18 28 4 14 0 +TABLE test t1 47 29 18 29 4 14 0 TABLE test t2 76 48 28 48 8 20 0 TABLE test t3 120 78 42 78 12 30 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_low_priority count_write_external -TABLE test t1 22 9 13 0 0 0 0 9 0 13 -TABLE test t2 26 9 17 0 0 0 0 9 0 17 -TABLE test t3 30 9 21 0 0 0 0 9 0 21 +TABLE test t1 44 18 26 8 0 0 1 9 0 13 +TABLE test t2 52 18 34 8 0 0 1 9 0 17 +TABLE test t3 60 18 42 8 0 0 1 9 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 97 -TABLE test t2 136 -TABLE test t3 188 +TABLE test t1 91 +TABLE test t2 128 +TABLE test t3 180 disconnect con2; -======= -TABLE test t1 68 -TABLE test t2 102 -TABLE test t3 150 -"================== con2 disconnected ==================" ->>>>>>> merge-perfschema-5.7 "================== Step 14 ==================" call dump_thread(); username status @@ -1935,130 +1251,76 @@ username status user2 not found username event_name count_star user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +user3 wait/lock/table/sql/handler 36 username event_name count_star user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 +user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 37 +user1 localhost wait/io/table/sql/handler 33 user1 localhost wait/lock/table/sql/handler 48 -user2 localhost wait/io/table/sql/handler 57 +user2 localhost wait/io/table/sql/handler 51 user2 localhost wait/lock/table/sql/handler 36 -user3 localhost wait/io/table/sql/handler 76 +user3 localhost wait/io/table/sql/handler 70 user3 localhost wait/lock/table/sql/handler 36 -user4 localhost wait/io/table/sql/handler 95 +user4 localhost wait/io/table/sql/handler 89 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 48 -user2 wait/io/table/sql/handler 57 +user2 wait/io/table/sql/handler 51 user2 wait/lock/table/sql/handler 36 -user3 wait/io/table/sql/handler 76 +user3 wait/io/table/sql/handler 70 user3 wait/lock/table/sql/handler 36 -user4 wait/io/table/sql/handler 95 +user4 wait/io/table/sql/handler 89 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 265 +localhost wait/io/table/sql/handler 243 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 265 +wait/io/table/sql/handler 243 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 53 TABLE test t1 +wait/io/table/sql/handler 47 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 -wait/io/table/sql/handler 84 TABLE test t2 -wait/lock/table/sql/handler 52 TABLE test t2 -wait/io/table/sql/handler 128 TABLE test t3 -wait/lock/table/sql/handler 60 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 42 28 14 28 4 10 0 -TABLE test t1 index_b 3 3 0 3 0 0 0 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 24 -user2 localhost wait/io/table/sql/handler 51 -user2 localhost wait/lock/table/sql/handler 18 -user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 -user4 localhost wait/io/table/sql/handler 89 -user4 localhost wait/lock/table/sql/handler 18 -execute dump_waits_user; -user event_name count_star -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 -user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 -user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 -user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 -execute dump_waits_host; -host event_name count_star -localhost wait/io/table/sql/handler 242 -localhost wait/lock/table/sql/handler 78 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 242 -wait/lock/table/sql/handler 78 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 46 TABLE test t1 -wait/lock/table/sql/handler 22 TABLE test t1 wait/io/table/sql/handler 76 TABLE test t2 -wait/lock/table/sql/handler 26 TABLE test t2 +wait/lock/table/sql/handler 52 TABLE test t2 wait/io/table/sql/handler 120 TABLE test t3 -wait/lock/table/sql/handler 30 TABLE test t3 +wait/lock/table/sql/handler 60 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 28 24 4 24 4 0 0 +TABLE test t1 NULL 39 25 14 25 4 10 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 18 4 14 4 0 14 0 -TABLE test t2 NULL 52 44 8 44 8 0 0 +TABLE test t1 PRIMARY 8 4 4 4 0 4 0 +TABLE test t2 NULL 72 44 28 44 8 20 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 24 4 20 4 0 20 0 -TABLE test t3 NULL 76 64 12 64 12 0 0 +TABLE test t2 PRIMARY 4 4 0 4 0 0 0 +TABLE test t3 NULL 106 64 42 64 12 30 0 TABLE test t3 index_b 10 10 0 10 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 34 4 30 4 0 30 0 +TABLE test t3 PRIMARY 4 4 0 4 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 -<<<<<<< HEAD -TABLE test t1 53 35 18 35 4 14 0 -TABLE test t2 84 56 28 56 8 20 0 -TABLE test t3 128 86 42 86 12 30 0 -======= -TABLE test t1 46 28 18 28 4 14 0 +TABLE test t1 47 29 18 29 4 14 0 TABLE test t2 76 48 28 48 8 20 0 TABLE test t3 120 78 42 78 12 30 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_low_priority count_write_external -TABLE test t1 22 9 13 0 0 0 0 9 0 13 -TABLE test t2 26 9 17 0 0 0 0 9 0 17 -TABLE test t3 30 9 21 0 0 0 0 9 0 21 +TABLE test t1 44 18 26 8 0 0 1 9 0 13 +TABLE test t2 52 18 34 8 0 0 1 9 0 17 +TABLE test t3 60 18 42 8 0 0 1 9 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 97 -TABLE test t2 136 -TABLE test t3 188 +TABLE test t1 91 +TABLE test t2 128 +TABLE test t3 180 disconnect con3; -======= -TABLE test t1 68 -TABLE test t2 102 -TABLE test t3 150 -"================== con3 disconnected ==================" ->>>>>>> merge-perfschema-5.7 "================== Step 15 ==================" call dump_thread(); username status @@ -2069,127 +1331,73 @@ username status user3 not found username event_name count_star user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 +user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 37 +user1 localhost wait/io/table/sql/handler 33 user1 localhost wait/lock/table/sql/handler 48 -user2 localhost wait/io/table/sql/handler 57 +user2 localhost wait/io/table/sql/handler 51 user2 localhost wait/lock/table/sql/handler 36 -user3 localhost wait/io/table/sql/handler 76 +user3 localhost wait/io/table/sql/handler 70 user3 localhost wait/lock/table/sql/handler 36 -user4 localhost wait/io/table/sql/handler 95 +user4 localhost wait/io/table/sql/handler 89 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 48 -user2 wait/io/table/sql/handler 57 +user2 wait/io/table/sql/handler 51 user2 wait/lock/table/sql/handler 36 -user3 wait/io/table/sql/handler 76 +user3 wait/io/table/sql/handler 70 user3 wait/lock/table/sql/handler 36 -user4 wait/io/table/sql/handler 95 +user4 wait/io/table/sql/handler 89 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 265 +localhost wait/io/table/sql/handler 243 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 265 +wait/io/table/sql/handler 243 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 53 TABLE test t1 +wait/io/table/sql/handler 47 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 -wait/io/table/sql/handler 84 TABLE test t2 -wait/lock/table/sql/handler 52 TABLE test t2 -wait/io/table/sql/handler 128 TABLE test t3 -wait/lock/table/sql/handler 60 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 42 28 14 28 4 10 0 -TABLE test t1 index_b 3 3 0 3 0 0 0 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 24 -user2 localhost wait/io/table/sql/handler 51 -user2 localhost wait/lock/table/sql/handler 18 -user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 -user4 localhost wait/io/table/sql/handler 89 -user4 localhost wait/lock/table/sql/handler 18 -execute dump_waits_user; -user event_name count_star -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 -user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 -user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 -user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 -execute dump_waits_host; -host event_name count_star -localhost wait/io/table/sql/handler 242 -localhost wait/lock/table/sql/handler 78 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 242 -wait/lock/table/sql/handler 78 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 46 TABLE test t1 -wait/lock/table/sql/handler 22 TABLE test t1 wait/io/table/sql/handler 76 TABLE test t2 -wait/lock/table/sql/handler 26 TABLE test t2 +wait/lock/table/sql/handler 52 TABLE test t2 wait/io/table/sql/handler 120 TABLE test t3 -wait/lock/table/sql/handler 30 TABLE test t3 +wait/lock/table/sql/handler 60 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 28 24 4 24 4 0 0 +TABLE test t1 NULL 39 25 14 25 4 10 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 18 4 14 4 0 14 0 -TABLE test t2 NULL 52 44 8 44 8 0 0 +TABLE test t1 PRIMARY 8 4 4 4 0 4 0 +TABLE test t2 NULL 72 44 28 44 8 20 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 24 4 20 4 0 20 0 -TABLE test t3 NULL 76 64 12 64 12 0 0 +TABLE test t2 PRIMARY 4 4 0 4 0 0 0 +TABLE test t3 NULL 106 64 42 64 12 30 0 TABLE test t3 index_b 10 10 0 10 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 34 4 30 4 0 30 0 +TABLE test t3 PRIMARY 4 4 0 4 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 -<<<<<<< HEAD -TABLE test t1 53 35 18 35 4 14 0 -TABLE test t2 84 56 28 56 8 20 0 -TABLE test t3 128 86 42 86 12 30 0 -======= -TABLE test t1 46 28 18 28 4 14 0 +TABLE test t1 47 29 18 29 4 14 0 TABLE test t2 76 48 28 48 8 20 0 TABLE test t3 120 78 42 78 12 30 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_low_priority count_write_external -TABLE test t1 22 9 13 0 0 0 0 9 0 13 -TABLE test t2 26 9 17 0 0 0 0 9 0 17 -TABLE test t3 30 9 21 0 0 0 0 9 0 21 +TABLE test t1 44 18 26 8 0 0 1 9 0 13 +TABLE test t2 52 18 34 8 0 0 1 9 0 17 +TABLE test t3 60 18 42 8 0 0 1 9 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 97 -TABLE test t2 136 -TABLE test t3 188 +TABLE test t1 91 +TABLE test t2 128 +TABLE test t3 180 disconnect con4; -======= -TABLE test t1 68 -TABLE test t2 102 -TABLE test t3 150 -"================== con4 disconnected ==================" ->>>>>>> merge-perfschema-5.7 "================== Step 16 ==================" call dump_thread(); username status @@ -2202,123 +1410,70 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 37 +user1 localhost wait/io/table/sql/handler 33 user1 localhost wait/lock/table/sql/handler 48 -user2 localhost wait/io/table/sql/handler 57 +user2 localhost wait/io/table/sql/handler 51 user2 localhost wait/lock/table/sql/handler 36 -user3 localhost wait/io/table/sql/handler 76 +user3 localhost wait/io/table/sql/handler 70 user3 localhost wait/lock/table/sql/handler 36 -user4 localhost wait/io/table/sql/handler 95 +user4 localhost wait/io/table/sql/handler 89 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 48 -user2 wait/io/table/sql/handler 57 +user2 wait/io/table/sql/handler 51 user2 wait/lock/table/sql/handler 36 -user3 wait/io/table/sql/handler 76 +user3 wait/io/table/sql/handler 70 user3 wait/lock/table/sql/handler 36 -user4 wait/io/table/sql/handler 95 +user4 wait/io/table/sql/handler 89 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 265 +localhost wait/io/table/sql/handler 243 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 265 +wait/io/table/sql/handler 243 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 53 TABLE test t1 +wait/io/table/sql/handler 47 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 -wait/io/table/sql/handler 84 TABLE test t2 -wait/lock/table/sql/handler 52 TABLE test t2 -wait/io/table/sql/handler 128 TABLE test t3 -wait/lock/table/sql/handler 60 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 42 28 14 28 4 10 0 -TABLE test t1 index_b 3 3 0 3 0 0 0 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 24 -user2 localhost wait/io/table/sql/handler 51 -user2 localhost wait/lock/table/sql/handler 18 -user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 -user4 localhost wait/io/table/sql/handler 89 -user4 localhost wait/lock/table/sql/handler 18 -execute dump_waits_user; -user event_name count_star -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 -user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 -user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 -user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 -execute dump_waits_host; -host event_name count_star -localhost wait/io/table/sql/handler 242 -localhost wait/lock/table/sql/handler 78 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 242 -wait/lock/table/sql/handler 78 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 46 TABLE test t1 -wait/lock/table/sql/handler 22 TABLE test t1 wait/io/table/sql/handler 76 TABLE test t2 -wait/lock/table/sql/handler 26 TABLE test t2 +wait/lock/table/sql/handler 52 TABLE test t2 wait/io/table/sql/handler 120 TABLE test t3 -wait/lock/table/sql/handler 30 TABLE test t3 +wait/lock/table/sql/handler 60 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 28 24 4 24 4 0 0 +TABLE test t1 NULL 39 25 14 25 4 10 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 18 4 14 4 0 14 0 -TABLE test t2 NULL 52 44 8 44 8 0 0 +TABLE test t1 PRIMARY 8 4 4 4 0 4 0 +TABLE test t2 NULL 72 44 28 44 8 20 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 24 4 20 4 0 20 0 -TABLE test t3 NULL 76 64 12 64 12 0 0 +TABLE test t2 PRIMARY 4 4 0 4 0 0 0 +TABLE test t3 NULL 106 64 42 64 12 30 0 TABLE test t3 index_b 10 10 0 10 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 34 4 30 4 0 30 0 +TABLE test t3 PRIMARY 4 4 0 4 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 -<<<<<<< HEAD -TABLE test t1 53 35 18 35 4 14 0 -TABLE test t2 84 56 28 56 8 20 0 -TABLE test t3 128 86 42 86 12 30 0 -======= -TABLE test t1 46 28 18 28 4 14 0 +TABLE test t1 47 29 18 29 4 14 0 TABLE test t2 76 48 28 48 8 20 0 TABLE test t3 120 78 42 78 12 30 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_low_priority count_write_external -TABLE test t1 22 9 13 0 0 0 0 9 0 13 -TABLE test t2 26 9 17 0 0 0 0 9 0 17 -TABLE test t3 30 9 21 0 0 0 0 9 0 21 +TABLE test t1 44 18 26 8 0 0 1 9 0 13 +TABLE test t2 52 18 34 8 0 0 1 9 0 17 +TABLE test t3 60 18 42 8 0 0 1 9 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 97 -TABLE test t2 136 -TABLE test t3 188 +TABLE test t1 91 +TABLE test t2 128 +TABLE test t3 180 connection default; -======= -TABLE test t1 68 -TABLE test t2 102 -TABLE test t3 150 ->>>>>>> merge-perfschema-5.7 truncate performance_schema.events_waits_summary_by_thread_by_event_name; "================== BY_THREAD truncated ==================" "================== Step 17 ==================" @@ -2333,122 +1488,69 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 37 +user1 localhost wait/io/table/sql/handler 33 user1 localhost wait/lock/table/sql/handler 48 -user2 localhost wait/io/table/sql/handler 57 +user2 localhost wait/io/table/sql/handler 51 user2 localhost wait/lock/table/sql/handler 36 -user3 localhost wait/io/table/sql/handler 76 +user3 localhost wait/io/table/sql/handler 70 user3 localhost wait/lock/table/sql/handler 36 -user4 localhost wait/io/table/sql/handler 95 +user4 localhost wait/io/table/sql/handler 89 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 48 -user2 wait/io/table/sql/handler 57 +user2 wait/io/table/sql/handler 51 user2 wait/lock/table/sql/handler 36 -user3 wait/io/table/sql/handler 76 +user3 wait/io/table/sql/handler 70 user3 wait/lock/table/sql/handler 36 -user4 wait/io/table/sql/handler 95 +user4 wait/io/table/sql/handler 89 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 265 +localhost wait/io/table/sql/handler 243 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 265 +wait/io/table/sql/handler 243 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 53 TABLE test t1 +wait/io/table/sql/handler 47 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 -wait/io/table/sql/handler 84 TABLE test t2 -wait/lock/table/sql/handler 52 TABLE test t2 -wait/io/table/sql/handler 128 TABLE test t3 -wait/lock/table/sql/handler 60 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 42 28 14 28 4 10 0 -TABLE test t1 index_b 3 3 0 3 0 0 0 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 24 -user2 localhost wait/io/table/sql/handler 51 -user2 localhost wait/lock/table/sql/handler 18 -user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 -user4 localhost wait/io/table/sql/handler 89 -user4 localhost wait/lock/table/sql/handler 18 -execute dump_waits_user; -user event_name count_star -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 -user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 -user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 -user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 -execute dump_waits_host; -host event_name count_star -localhost wait/io/table/sql/handler 242 -localhost wait/lock/table/sql/handler 78 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 242 -wait/lock/table/sql/handler 78 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 46 TABLE test t1 -wait/lock/table/sql/handler 22 TABLE test t1 wait/io/table/sql/handler 76 TABLE test t2 -wait/lock/table/sql/handler 26 TABLE test t2 +wait/lock/table/sql/handler 52 TABLE test t2 wait/io/table/sql/handler 120 TABLE test t3 -wait/lock/table/sql/handler 30 TABLE test t3 +wait/lock/table/sql/handler 60 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 28 24 4 24 4 0 0 +TABLE test t1 NULL 39 25 14 25 4 10 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 18 4 14 4 0 14 0 -TABLE test t2 NULL 52 44 8 44 8 0 0 +TABLE test t1 PRIMARY 8 4 4 4 0 4 0 +TABLE test t2 NULL 72 44 28 44 8 20 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 24 4 20 4 0 20 0 -TABLE test t3 NULL 76 64 12 64 12 0 0 +TABLE test t2 PRIMARY 4 4 0 4 0 0 0 +TABLE test t3 NULL 106 64 42 64 12 30 0 TABLE test t3 index_b 10 10 0 10 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 34 4 30 4 0 30 0 +TABLE test t3 PRIMARY 4 4 0 4 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 -<<<<<<< HEAD -TABLE test t1 53 35 18 35 4 14 0 -TABLE test t2 84 56 28 56 8 20 0 -TABLE test t3 128 86 42 86 12 30 0 -======= -TABLE test t1 46 28 18 28 4 14 0 +TABLE test t1 47 29 18 29 4 14 0 TABLE test t2 76 48 28 48 8 20 0 TABLE test t3 120 78 42 78 12 30 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_low_priority count_write_external -TABLE test t1 22 9 13 0 0 0 0 9 0 13 -TABLE test t2 26 9 17 0 0 0 0 9 0 17 -TABLE test t3 30 9 21 0 0 0 0 9 0 21 +TABLE test t1 44 18 26 8 0 0 1 9 0 13 +TABLE test t2 52 18 34 8 0 0 1 9 0 17 +TABLE test t3 60 18 42 8 0 0 1 9 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 97 -TABLE test t2 136 -TABLE test t3 188 -======= -TABLE test t1 68 -TABLE test t2 102 -TABLE test t3 150 ->>>>>>> merge-perfschema-5.7 +TABLE test t1 91 +TABLE test t2 128 +TABLE test t3 180 truncate performance_schema.events_waits_summary_by_account_by_event_name; "================== BY_ACCOUNT truncated ==================" "================== Step 18 ==================" @@ -2473,102 +1575,59 @@ 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 37 +user1 wait/io/table/sql/handler 33 user1 wait/lock/table/sql/handler 48 -user2 wait/io/table/sql/handler 57 +user2 wait/io/table/sql/handler 51 user2 wait/lock/table/sql/handler 36 -user3 wait/io/table/sql/handler 76 +user3 wait/io/table/sql/handler 70 user3 wait/lock/table/sql/handler 36 -user4 wait/io/table/sql/handler 95 +user4 wait/io/table/sql/handler 89 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 265 +localhost wait/io/table/sql/handler 243 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 265 +wait/io/table/sql/handler 243 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 53 TABLE test t1 +wait/io/table/sql/handler 47 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 -wait/io/table/sql/handler 84 TABLE test t2 -wait/lock/table/sql/handler 52 TABLE test t2 -wait/io/table/sql/handler 128 TABLE test t3 -wait/lock/table/sql/handler 60 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 42 28 14 28 4 10 0 -TABLE test t1 index_b 3 3 0 3 0 0 0 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 -user2 wait/io/table/sql/handler 51 -user2 wait/lock/table/sql/handler 18 -user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 -user4 wait/io/table/sql/handler 89 -user4 wait/lock/table/sql/handler 18 -execute dump_waits_host; -host event_name count_star -localhost wait/io/table/sql/handler 242 -localhost wait/lock/table/sql/handler 78 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 242 -wait/lock/table/sql/handler 78 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 46 TABLE test t1 -wait/lock/table/sql/handler 22 TABLE test t1 wait/io/table/sql/handler 76 TABLE test t2 -wait/lock/table/sql/handler 26 TABLE test t2 +wait/lock/table/sql/handler 52 TABLE test t2 wait/io/table/sql/handler 120 TABLE test t3 -wait/lock/table/sql/handler 30 TABLE test t3 +wait/lock/table/sql/handler 60 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 28 24 4 24 4 0 0 +TABLE test t1 NULL 39 25 14 25 4 10 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 18 4 14 4 0 14 0 -TABLE test t2 NULL 52 44 8 44 8 0 0 +TABLE test t1 PRIMARY 8 4 4 4 0 4 0 +TABLE test t2 NULL 72 44 28 44 8 20 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 24 4 20 4 0 20 0 -TABLE test t3 NULL 76 64 12 64 12 0 0 +TABLE test t2 PRIMARY 4 4 0 4 0 0 0 +TABLE test t3 NULL 106 64 42 64 12 30 0 TABLE test t3 index_b 10 10 0 10 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 34 4 30 4 0 30 0 +TABLE test t3 PRIMARY 4 4 0 4 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 -<<<<<<< HEAD -TABLE test t1 53 35 18 35 4 14 0 -TABLE test t2 84 56 28 56 8 20 0 -TABLE test t3 128 86 42 86 12 30 0 -======= -TABLE test t1 46 28 18 28 4 14 0 +TABLE test t1 47 29 18 29 4 14 0 TABLE test t2 76 48 28 48 8 20 0 TABLE test t3 120 78 42 78 12 30 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_low_priority count_write_external -TABLE test t1 22 9 13 0 0 0 0 9 0 13 -TABLE test t2 26 9 17 0 0 0 0 9 0 17 -TABLE test t3 30 9 21 0 0 0 0 9 0 21 +TABLE test t1 44 18 26 8 0 0 1 9 0 13 +TABLE test t2 52 18 34 8 0 0 1 9 0 17 +TABLE test t3 60 18 42 8 0 0 1 9 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 97 -TABLE test t2 136 -TABLE test t3 188 -======= -TABLE test t1 68 -TABLE test t2 102 -TABLE test t3 150 ->>>>>>> merge-perfschema-5.7 +TABLE test t1 91 +TABLE test t2 128 +TABLE test t3 180 truncate performance_schema.events_waits_summary_by_user_by_event_name; "================== BY_USER truncated ==================" "================== Step 19 ==================" @@ -2603,82 +1662,49 @@ 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 265 +localhost wait/io/table/sql/handler 243 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 265 +wait/io/table/sql/handler 243 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 53 TABLE test t1 +wait/io/table/sql/handler 47 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 -wait/io/table/sql/handler 84 TABLE test t2 -wait/lock/table/sql/handler 52 TABLE test t2 -wait/io/table/sql/handler 128 TABLE test t3 -wait/lock/table/sql/handler 60 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 42 28 14 28 4 10 0 -TABLE test t1 index_b 3 3 0 3 0 0 0 -======= -localhost wait/io/table/sql/handler 242 -localhost wait/lock/table/sql/handler 78 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 242 -wait/lock/table/sql/handler 78 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 46 TABLE test t1 -wait/lock/table/sql/handler 22 TABLE test t1 wait/io/table/sql/handler 76 TABLE test t2 -wait/lock/table/sql/handler 26 TABLE test t2 +wait/lock/table/sql/handler 52 TABLE test t2 wait/io/table/sql/handler 120 TABLE test t3 -wait/lock/table/sql/handler 30 TABLE test t3 +wait/lock/table/sql/handler 60 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 28 24 4 24 4 0 0 +TABLE test t1 NULL 39 25 14 25 4 10 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 18 4 14 4 0 14 0 -TABLE test t2 NULL 52 44 8 44 8 0 0 +TABLE test t1 PRIMARY 8 4 4 4 0 4 0 +TABLE test t2 NULL 72 44 28 44 8 20 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 24 4 20 4 0 20 0 -TABLE test t3 NULL 76 64 12 64 12 0 0 +TABLE test t2 PRIMARY 4 4 0 4 0 0 0 +TABLE test t3 NULL 106 64 42 64 12 30 0 TABLE test t3 index_b 10 10 0 10 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 34 4 30 4 0 30 0 +TABLE test t3 PRIMARY 4 4 0 4 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 -<<<<<<< HEAD -TABLE test t1 53 35 18 35 4 14 0 -TABLE test t2 84 56 28 56 8 20 0 -TABLE test t3 128 86 42 86 12 30 0 -======= -TABLE test t1 46 28 18 28 4 14 0 +TABLE test t1 47 29 18 29 4 14 0 TABLE test t2 76 48 28 48 8 20 0 TABLE test t3 120 78 42 78 12 30 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_low_priority count_write_external -TABLE test t1 22 9 13 0 0 0 0 9 0 13 -TABLE test t2 26 9 17 0 0 0 0 9 0 17 -TABLE test t3 30 9 21 0 0 0 0 9 0 21 +TABLE test t1 44 18 26 8 0 0 1 9 0 13 +TABLE test t2 52 18 34 8 0 0 1 9 0 17 +TABLE test t3 60 18 42 8 0 0 1 9 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 97 -TABLE test t2 136 -TABLE test t3 188 -======= -TABLE test t1 68 -TABLE test t2 102 -TABLE test t3 150 ->>>>>>> merge-perfschema-5.7 +TABLE test t1 91 +TABLE test t2 128 +TABLE test t3 180 truncate performance_schema.events_waits_summary_by_host_by_event_name; "================== BY_HOST truncated ==================" "================== Step 21 ==================" @@ -2717,74 +1743,45 @@ 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 265 +wait/io/table/sql/handler 243 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 53 TABLE test t1 +wait/io/table/sql/handler 47 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 -wait/io/table/sql/handler 84 TABLE test t2 -wait/lock/table/sql/handler 52 TABLE test t2 -wait/io/table/sql/handler 128 TABLE test t3 -wait/lock/table/sql/handler 60 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 42 28 14 28 4 10 0 -TABLE test t1 index_b 3 3 0 3 0 0 0 -======= -wait/io/table/sql/handler 242 -wait/lock/table/sql/handler 78 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 46 TABLE test t1 -wait/lock/table/sql/handler 22 TABLE test t1 wait/io/table/sql/handler 76 TABLE test t2 -wait/lock/table/sql/handler 26 TABLE test t2 +wait/lock/table/sql/handler 52 TABLE test t2 wait/io/table/sql/handler 120 TABLE test t3 -wait/lock/table/sql/handler 30 TABLE test t3 +wait/lock/table/sql/handler 60 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 28 24 4 24 4 0 0 +TABLE test t1 NULL 39 25 14 25 4 10 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 18 4 14 4 0 14 0 -TABLE test t2 NULL 52 44 8 44 8 0 0 +TABLE test t1 PRIMARY 8 4 4 4 0 4 0 +TABLE test t2 NULL 72 44 28 44 8 20 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 24 4 20 4 0 20 0 -TABLE test t3 NULL 76 64 12 64 12 0 0 +TABLE test t2 PRIMARY 4 4 0 4 0 0 0 +TABLE test t3 NULL 106 64 42 64 12 30 0 TABLE test t3 index_b 10 10 0 10 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 34 4 30 4 0 30 0 +TABLE test t3 PRIMARY 4 4 0 4 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 -<<<<<<< HEAD -TABLE test t1 53 35 18 35 4 14 0 -TABLE test t2 84 56 28 56 8 20 0 -TABLE test t3 128 86 42 86 12 30 0 -======= -TABLE test t1 46 28 18 28 4 14 0 +TABLE test t1 47 29 18 29 4 14 0 TABLE test t2 76 48 28 48 8 20 0 TABLE test t3 120 78 42 78 12 30 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_low_priority count_write_external -TABLE test t1 22 9 13 0 0 0 0 9 0 13 -TABLE test t2 26 9 17 0 0 0 0 9 0 17 -TABLE test t3 30 9 21 0 0 0 0 9 0 21 +TABLE test t1 44 18 26 8 0 0 1 9 0 13 +TABLE test t2 52 18 34 8 0 0 1 9 0 17 +TABLE test t3 60 18 42 8 0 0 1 9 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 97 -TABLE test t2 136 -TABLE test t3 188 -======= -TABLE test t1 68 -TABLE test t2 102 -TABLE test t3 150 ->>>>>>> merge-perfschema-5.7 +TABLE test t1 91 +TABLE test t2 128 +TABLE test t3 180 truncate performance_schema.events_waits_summary_global_by_event_name; "================== GLOBAL truncated ==================" "================== Step 21 ==================" @@ -2827,21 +1824,12 @@ 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 53 TABLE test t1 +wait/io/table/sql/handler 47 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 -wait/io/table/sql/handler 84 TABLE test t2 -wait/lock/table/sql/handler 52 TABLE test t2 -wait/io/table/sql/handler 128 TABLE test t3 -wait/lock/table/sql/handler 60 TABLE test t3 -======= -wait/io/table/sql/handler 46 TABLE test t1 -wait/lock/table/sql/handler 22 TABLE test t1 wait/io/table/sql/handler 76 TABLE test t2 -wait/lock/table/sql/handler 26 TABLE test t2 +wait/lock/table/sql/handler 52 TABLE test t2 wait/io/table/sql/handler 120 TABLE test t3 -wait/lock/table/sql/handler 30 TABLE test t3 ->>>>>>> merge-perfschema-5.7 +wait/lock/table/sql/handler 60 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 0 0 0 0 0 0 0 |