diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result | 1470 |
1 files changed, 355 insertions, 1115 deletions
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result index 8c2a5791ade..3d993ada59f 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_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. update performance_schema.setup_consumers set enabled='NO' where name like 'event%'; delete from performance_schema.setup_actors @@ -53,85 +41,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 @@ -274,21 +183,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 @@ -297,74 +197,60 @@ 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 -======= -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 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 +TABLE test t1 18 +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 @@ -373,69 +259,52 @@ 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 ->>>>>>> merge-perfschema-5.7 +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 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 -<<<<<<< HEAD TABLE test t1 NULL 6 4 2 4 1 1 0 -======= -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 connect con2, localhost, user2, , ; -======= -TABLE test t1 12 -TABLE test t2 16 -TABLE test t3 22 ->>>>>>> merge-perfschema-5.7 select concat(current_user(), " is connected") as status; status user2@localhost is connected @@ -443,13 +312,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 @@ -459,91 +323,56 @@ 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 -======= -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 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD TABLE test t1 NULL 6 4 2 4 1 1 0 -======= -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; @@ -586,13 +415,8 @@ 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 0 user2 wait/lock/table/sql/handler 0 @@ -602,91 +426,56 @@ 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 -======= -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 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD TABLE test t1 NULL 6 4 2 4 1 1 0 -======= -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 connect con3, localhost, user3, , ; -======= -TABLE test t1 12 -TABLE test t2 16 -TABLE test t3 22 ->>>>>>> merge-perfschema-5.7 select concat(current_user(), " is connected") as status; status user3@localhost is connected @@ -694,13 +483,8 @@ 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 0 user2 wait/lock/table/sql/handler 0 @@ -711,95 +495,60 @@ 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 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 -======= -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 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 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 -======= -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 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD TABLE test t1 NULL 6 4 2 4 1 1 0 -======= -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 con3; -======= -TABLE test t1 12 -TABLE test t2 16 -TABLE test t3 22 ->>>>>>> merge-perfschema-5.7 insert into test.t1 set a=301, b=1, c=1; insert into test.t2 set a=302, b=2, c=2; insert into test.t2 set a=303, b=3, c=3; @@ -849,113 +598,72 @@ 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 0 user2 wait/lock/table/sql/handler 0 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 -======= -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 user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 +user3 localhost wait/lock/table/sql/handler 36 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 user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +user3 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 113 +localhost wait/io/table/sql/handler 103 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 113 +wait/io/table/sql/handler 103 wait/lock/table/sql/handler 72 -======= -localhost wait/io/table/sql/handler 102 -localhost wait/lock/table/sql/handler 36 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 102 -wait/lock/table/sql/handler 36 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD -TABLE test t1 NULL 18 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 NULL 17 11 6 11 2 4 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 8 2 6 2 0 6 0 -TABLE test t2 NULL 22 18 4 18 4 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 0 +TABLE test t2 NULL 30 18 12 18 4 8 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 10 2 8 2 0 8 0 -TABLE test t3 NULL 32 26 6 26 6 0 0 +TABLE test t2 PRIMARY 2 2 0 2 0 0 0 +TABLE test t3 NULL 44 26 18 26 6 12 0 TABLE test t3 index_b 4 4 0 4 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 14 2 12 2 0 12 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 23 15 8 15 2 6 0 -TABLE test t2 36 24 12 24 4 8 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t2 32 20 12 20 4 8 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_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 43 -TABLE test t2 60 -TABLE test t3 82 +TABLE test t1 41 +TABLE test t2 56 +TABLE test t3 78 connect con4, localhost, user4, , ; -======= -TABLE test t1 30 -TABLE test t2 44 -TABLE test t3 64 ->>>>>>> merge-perfschema-5.7 select concat(current_user(), " is connected") as status; status user4@localhost is connected @@ -963,118 +671,77 @@ 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 0 user2 wait/lock/table/sql/handler 0 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 -======= -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 user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 +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 -======= -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 user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +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 113 +localhost wait/io/table/sql/handler 103 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 113 +wait/io/table/sql/handler 103 wait/lock/table/sql/handler 72 -======= -localhost wait/io/table/sql/handler 102 -localhost wait/lock/table/sql/handler 36 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 102 -wait/lock/table/sql/handler 36 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD -TABLE test t1 NULL 18 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 NULL 17 11 6 11 2 4 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 8 2 6 2 0 6 0 -TABLE test t2 NULL 22 18 4 18 4 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 0 +TABLE test t2 NULL 30 18 12 18 4 8 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 10 2 8 2 0 8 0 -TABLE test t3 NULL 32 26 6 26 6 0 0 +TABLE test t2 PRIMARY 2 2 0 2 0 0 0 +TABLE test t3 NULL 44 26 18 26 6 12 0 TABLE test t3 index_b 4 4 0 4 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 14 2 12 2 0 12 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 23 15 8 15 2 6 0 -TABLE test t2 36 24 12 24 4 8 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t2 32 20 12 20 4 8 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_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 43 -TABLE test t2 60 -TABLE test t3 82 +TABLE test t1 41 +TABLE test t2 56 +TABLE test t3 78 connection con4; -======= -TABLE test t1 30 -TABLE test t2 44 -TABLE test t3 64 ->>>>>>> merge-perfschema-5.7 insert into test.t1 set a=401, b=1, c=1; insert into test.t2 set a=402, b=2, c=2; insert into test.t2 set a=403, b=3, c=3; @@ -1131,118 +798,77 @@ 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 0 user2 wait/lock/table/sql/handler 0 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 -======= -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 user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 +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 -======= -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 user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +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 113 +localhost wait/io/table/sql/handler 103 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 113 +wait/io/table/sql/handler 103 wait/lock/table/sql/handler 72 -======= -localhost wait/io/table/sql/handler 102 -localhost wait/lock/table/sql/handler 36 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 102 -wait/lock/table/sql/handler 36 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD -TABLE test t1 NULL 18 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 NULL 17 11 6 11 2 4 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 8 2 6 2 0 6 0 -TABLE test t2 NULL 22 18 4 18 4 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 0 +TABLE test t2 NULL 30 18 12 18 4 8 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 10 2 8 2 0 8 0 -TABLE test t3 NULL 32 26 6 26 6 0 0 +TABLE test t2 PRIMARY 2 2 0 2 0 0 0 +TABLE test t3 NULL 44 26 18 26 6 12 0 TABLE test t3 index_b 4 4 0 4 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 14 2 12 2 0 12 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 23 15 8 15 2 6 0 -TABLE test t2 36 24 12 24 4 8 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t2 32 20 12 20 4 8 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_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 43 -TABLE test t2 60 -TABLE test t3 82 +TABLE test t1 41 +TABLE test t2 56 +TABLE test t3 78 connection con1; -======= -TABLE test t1 30 -TABLE test t2 44 -TABLE test t3 64 ->>>>>>> merge-perfschema-5.7 lock tables test.t1 read, test.t2 read, test.t3 read; unlock tables; lock tables test.t1 write, test.t2 write, test.t3 write; @@ -1251,353 +877,229 @@ 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 0 user2 wait/lock/table/sql/handler 0 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 48 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 +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 48 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +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 113 +localhost wait/io/table/sql/handler 103 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 113 +wait/io/table/sql/handler 103 wait/lock/table/sql/handler 84 -======= -localhost wait/io/table/sql/handler 102 -localhost wait/lock/table/sql/handler 42 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 102 -wait/lock/table/sql/handler 42 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD -TABLE test t1 NULL 18 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 NULL 17 11 6 11 2 4 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 8 2 6 2 0 6 0 -TABLE test t2 NULL 22 18 4 18 4 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 0 +TABLE test t2 NULL 30 18 12 18 4 8 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 10 2 8 2 0 8 0 -TABLE test t3 NULL 32 26 6 26 6 0 0 +TABLE test t2 PRIMARY 2 2 0 2 0 0 0 +TABLE test t3 NULL 44 26 18 26 6 12 0 TABLE test t3 index_b 4 4 0 4 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 14 2 12 2 0 12 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 23 15 8 15 2 6 0 -TABLE test t2 36 24 12 24 4 8 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t2 32 20 12 20 4 8 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external -TABLE test t1 12 5 7 0 0 0 0 5 0 7 -TABLE test t2 14 5 9 0 0 0 0 5 0 9 -TABLE test t3 16 5 11 0 0 0 0 5 0 11 +TABLE test t1 24 10 14 4 0 0 1 5 0 7 +TABLE test t2 28 10 18 4 0 0 1 5 0 9 +TABLE test t3 32 10 22 4 0 0 1 5 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 47 -TABLE test t2 64 -TABLE test t3 86 +TABLE test t1 45 +TABLE test t2 60 +TABLE test t3 82 connection default; -======= -TABLE test t1 32 -TABLE test t2 46 -TABLE test t3 66 ->>>>>>> merge-perfschema-5.7 flush tables; "================== flush marker ==================" "================== Step 11 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 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 0 user2 wait/lock/table/sql/handler 0 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 48 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 +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 48 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +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 113 +localhost wait/io/table/sql/handler 103 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 113 +wait/io/table/sql/handler 103 wait/lock/table/sql/handler 84 -======= -localhost wait/io/table/sql/handler 102 -localhost wait/lock/table/sql/handler 42 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 102 -wait/lock/table/sql/handler 42 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD -TABLE test t1 NULL 18 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 NULL 17 11 6 11 2 4 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 8 2 6 2 0 6 0 -TABLE test t2 NULL 22 18 4 18 4 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 0 +TABLE test t2 NULL 30 18 12 18 4 8 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 10 2 8 2 0 8 0 -TABLE test t3 NULL 32 26 6 26 6 0 0 +TABLE test t2 PRIMARY 2 2 0 2 0 0 0 +TABLE test t3 NULL 44 26 18 26 6 12 0 TABLE test t3 index_b 4 4 0 4 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 14 2 12 2 0 12 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 23 15 8 15 2 6 0 -TABLE test t2 36 24 12 24 4 8 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t2 32 20 12 20 4 8 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external -TABLE test t1 12 5 7 0 0 0 0 5 0 7 -TABLE test t2 14 5 9 0 0 0 0 5 0 9 -TABLE test t3 16 5 11 0 0 0 0 5 0 11 +TABLE test t1 24 10 14 4 0 0 1 5 0 7 +TABLE test t2 28 10 18 4 0 0 1 5 0 9 +TABLE test t3 32 10 22 4 0 0 1 5 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 47 -TABLE test t2 64 -TABLE test t3 86 -======= -TABLE test t1 32 -TABLE test t2 46 -TABLE test t3 66 ->>>>>>> merge-perfschema-5.7 +TABLE test t1 45 +TABLE test t2 60 +TABLE test t3 82 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 0 user2 wait/lock/table/sql/handler 0 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 48 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 +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 48 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +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 113 +localhost wait/io/table/sql/handler 103 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 113 +wait/io/table/sql/handler 103 wait/lock/table/sql/handler 84 -======= -localhost wait/io/table/sql/handler 102 -localhost wait/lock/table/sql/handler 42 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 102 -wait/lock/table/sql/handler 42 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD -TABLE test t1 NULL 18 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 NULL 17 11 6 11 2 4 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 8 2 6 2 0 6 0 -TABLE test t2 NULL 22 18 4 18 4 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 0 +TABLE test t2 NULL 30 18 12 18 4 8 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 10 2 8 2 0 8 0 -TABLE test t3 NULL 32 26 6 26 6 0 0 +TABLE test t2 PRIMARY 2 2 0 2 0 0 0 +TABLE test t3 NULL 44 26 18 26 6 12 0 TABLE test t3 index_b 4 4 0 4 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 14 2 12 2 0 12 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 23 15 8 15 2 6 0 -TABLE test t2 36 24 12 24 4 8 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t2 32 20 12 20 4 8 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external -TABLE test t1 12 5 7 0 0 0 0 5 0 7 -TABLE test t2 14 5 9 0 0 0 0 5 0 9 -TABLE test t3 16 5 11 0 0 0 0 5 0 11 +TABLE test t1 24 10 14 4 0 0 1 5 0 7 +TABLE test t2 28 10 18 4 0 0 1 5 0 9 +TABLE test t3 32 10 22 4 0 0 1 5 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 47 -TABLE test t2 64 -TABLE test t3 86 +TABLE test t1 45 +TABLE test t2 60 +TABLE test t3 82 disconnect con1; -======= -TABLE test t1 32 -TABLE test t2 46 -TABLE test t3 66 -"================== con1 disconnected ==================" ->>>>>>> merge-perfschema-5.7 "================== Step 13 ==================" call dump_thread(); username status @@ -1607,107 +1109,70 @@ user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 username event_name count_star user3 wait/io/table/sql/handler 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 48 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 +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 48 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +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 113 +localhost wait/io/table/sql/handler 103 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 113 +wait/io/table/sql/handler 103 wait/lock/table/sql/handler 84 -======= -localhost wait/io/table/sql/handler 102 -localhost wait/lock/table/sql/handler 42 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 102 -wait/lock/table/sql/handler 42 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD -TABLE test t1 NULL 18 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 NULL 17 11 6 11 2 4 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 8 2 6 2 0 6 0 -TABLE test t2 NULL 22 18 4 18 4 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 0 +TABLE test t2 NULL 30 18 12 18 4 8 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 10 2 8 2 0 8 0 -TABLE test t3 NULL 32 26 6 26 6 0 0 +TABLE test t2 PRIMARY 2 2 0 2 0 0 0 +TABLE test t3 NULL 44 26 18 26 6 12 0 TABLE test t3 index_b 4 4 0 4 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 14 2 12 2 0 12 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 23 15 8 15 2 6 0 -TABLE test t2 36 24 12 24 4 8 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t2 32 20 12 20 4 8 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external -TABLE test t1 12 5 7 0 0 0 0 5 0 7 -TABLE test t2 14 5 9 0 0 0 0 5 0 9 -TABLE test t3 16 5 11 0 0 0 0 5 0 11 +TABLE test t1 24 10 14 4 0 0 1 5 0 7 +TABLE test t2 28 10 18 4 0 0 1 5 0 9 +TABLE test t3 32 10 22 4 0 0 1 5 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 47 -TABLE test t2 64 -TABLE test t3 86 +TABLE test t1 45 +TABLE test t2 60 +TABLE test t3 82 disconnect con2; -======= -TABLE test t1 32 -TABLE test t2 46 -TABLE test t3 66 -"================== con2 disconnected ==================" ->>>>>>> merge-perfschema-5.7 "================== Step 14 ==================" call dump_thread(); username status @@ -1716,107 +1181,70 @@ 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 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 48 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 +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 48 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +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 113 +localhost wait/io/table/sql/handler 103 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 113 +wait/io/table/sql/handler 103 wait/lock/table/sql/handler 84 -======= -localhost wait/io/table/sql/handler 102 -localhost wait/lock/table/sql/handler 42 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 102 -wait/lock/table/sql/handler 42 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD -TABLE test t1 NULL 18 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 NULL 17 11 6 11 2 4 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 8 2 6 2 0 6 0 -TABLE test t2 NULL 22 18 4 18 4 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 0 +TABLE test t2 NULL 30 18 12 18 4 8 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 10 2 8 2 0 8 0 -TABLE test t3 NULL 32 26 6 26 6 0 0 +TABLE test t2 PRIMARY 2 2 0 2 0 0 0 +TABLE test t3 NULL 44 26 18 26 6 12 0 TABLE test t3 index_b 4 4 0 4 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 14 2 12 2 0 12 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 23 15 8 15 2 6 0 -TABLE test t2 36 24 12 24 4 8 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t2 32 20 12 20 4 8 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external -TABLE test t1 12 5 7 0 0 0 0 5 0 7 -TABLE test t2 14 5 9 0 0 0 0 5 0 9 -TABLE test t3 16 5 11 0 0 0 0 5 0 11 +TABLE test t1 24 10 14 4 0 0 1 5 0 7 +TABLE test t2 28 10 18 4 0 0 1 5 0 9 +TABLE test t3 32 10 22 4 0 0 1 5 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 47 -TABLE test t2 64 -TABLE test t3 86 +TABLE test t1 45 +TABLE test t2 60 +TABLE test t3 82 disconnect con3; -======= -TABLE test t1 32 -TABLE test t2 46 -TABLE test t3 66 -"================== con3 disconnected ==================" ->>>>>>> merge-perfschema-5.7 "================== Step 15 ==================" call dump_thread(); username status @@ -1830,101 +1258,64 @@ 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 48 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 +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 48 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +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 113 +localhost wait/io/table/sql/handler 103 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 113 +wait/io/table/sql/handler 103 wait/lock/table/sql/handler 84 -======= -localhost wait/io/table/sql/handler 102 -localhost wait/lock/table/sql/handler 42 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 102 -wait/lock/table/sql/handler 42 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD -TABLE test t1 NULL 18 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 NULL 17 11 6 11 2 4 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 8 2 6 2 0 6 0 -TABLE test t2 NULL 22 18 4 18 4 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 0 +TABLE test t2 NULL 30 18 12 18 4 8 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 10 2 8 2 0 8 0 -TABLE test t3 NULL 32 26 6 26 6 0 0 +TABLE test t2 PRIMARY 2 2 0 2 0 0 0 +TABLE test t3 NULL 44 26 18 26 6 12 0 TABLE test t3 index_b 4 4 0 4 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 14 2 12 2 0 12 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 23 15 8 15 2 6 0 -TABLE test t2 36 24 12 24 4 8 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t2 32 20 12 20 4 8 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external -TABLE test t1 12 5 7 0 0 0 0 5 0 7 -TABLE test t2 14 5 9 0 0 0 0 5 0 9 -TABLE test t3 16 5 11 0 0 0 0 5 0 11 +TABLE test t1 24 10 14 4 0 0 1 5 0 7 +TABLE test t2 28 10 18 4 0 0 1 5 0 9 +TABLE test t3 32 10 22 4 0 0 1 5 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 47 -TABLE test t2 64 -TABLE test t3 86 +TABLE test t1 45 +TABLE test t2 60 +TABLE test t3 82 disconnect con4; -======= -TABLE test t1 32 -TABLE test t2 46 -TABLE test t3 66 -"================== con4 disconnected ==================" ->>>>>>> merge-perfschema-5.7 "================== Step 16 ==================" call dump_thread(); username status @@ -1937,100 +1328,64 @@ 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 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 +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 48 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +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 113 +localhost wait/io/table/sql/handler 103 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 113 +wait/io/table/sql/handler 103 wait/lock/table/sql/handler 84 -======= -localhost wait/io/table/sql/handler 102 -localhost wait/lock/table/sql/handler 42 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 102 -wait/lock/table/sql/handler 42 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD -TABLE test t1 NULL 18 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 NULL 17 11 6 11 2 4 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 8 2 6 2 0 6 0 -TABLE test t2 NULL 22 18 4 18 4 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 0 +TABLE test t2 NULL 30 18 12 18 4 8 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 10 2 8 2 0 8 0 -TABLE test t3 NULL 32 26 6 26 6 0 0 +TABLE test t2 PRIMARY 2 2 0 2 0 0 0 +TABLE test t3 NULL 44 26 18 26 6 12 0 TABLE test t3 index_b 4 4 0 4 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 14 2 12 2 0 12 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 23 15 8 15 2 6 0 -TABLE test t2 36 24 12 24 4 8 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t2 32 20 12 20 4 8 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external -TABLE test t1 12 5 7 0 0 0 0 5 0 7 -TABLE test t2 14 5 9 0 0 0 0 5 0 9 -TABLE test t3 16 5 11 0 0 0 0 5 0 11 +TABLE test t1 24 10 14 4 0 0 1 5 0 7 +TABLE test t2 28 10 18 4 0 0 1 5 0 9 +TABLE test t3 32 10 22 4 0 0 1 5 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 47 -TABLE test t2 64 -TABLE test t3 86 +TABLE test t1 45 +TABLE test t2 60 +TABLE test t3 82 connection default; -======= -TABLE test t1 32 -TABLE test t2 46 -TABLE test t3 66 ->>>>>>> merge-perfschema-5.7 truncate performance_schema.events_waits_summary_by_thread_by_event_name; "================== BY_THREAD truncated ==================" "================== Step 17 ==================" @@ -2045,99 +1400,63 @@ 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 -======= -user1 localhost wait/io/table/sql/handler 32 -user1 localhost wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 user3 localhost wait/io/table/sql/handler 70 -user3 localhost wait/lock/table/sql/handler 18 +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 48 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +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 113 +localhost wait/io/table/sql/handler 103 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 113 +wait/io/table/sql/handler 103 wait/lock/table/sql/handler 84 -======= -localhost wait/io/table/sql/handler 102 -localhost wait/lock/table/sql/handler 42 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 102 -wait/lock/table/sql/handler 42 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD -TABLE test t1 NULL 18 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 NULL 17 11 6 11 2 4 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 8 2 6 2 0 6 0 -TABLE test t2 NULL 22 18 4 18 4 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 0 +TABLE test t2 NULL 30 18 12 18 4 8 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 10 2 8 2 0 8 0 -TABLE test t3 NULL 32 26 6 26 6 0 0 +TABLE test t2 PRIMARY 2 2 0 2 0 0 0 +TABLE test t3 NULL 44 26 18 26 6 12 0 TABLE test t3 index_b 4 4 0 4 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 14 2 12 2 0 12 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 23 15 8 15 2 6 0 -TABLE test t2 36 24 12 24 4 8 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t2 32 20 12 20 4 8 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external -TABLE test t1 12 5 7 0 0 0 0 5 0 7 -TABLE test t2 14 5 9 0 0 0 0 5 0 9 -TABLE test t3 16 5 11 0 0 0 0 5 0 11 +TABLE test t1 24 10 14 4 0 0 1 5 0 7 +TABLE test t2 28 10 18 4 0 0 1 5 0 9 +TABLE test t3 32 10 22 4 0 0 1 5 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 47 -TABLE test t2 64 -TABLE test t3 86 -======= -TABLE test t1 32 -TABLE test t2 46 -TABLE test t3 66 ->>>>>>> merge-perfschema-5.7 +TABLE test t1 45 +TABLE test t2 60 +TABLE test t3 82 truncate performance_schema.events_waits_summary_by_account_by_event_name; "================== BY_ACCOUNT truncated ==================" "================== Step 18 ==================" @@ -2162,84 +1481,53 @@ 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 -======= -user1 wait/io/table/sql/handler 32 -user1 wait/lock/table/sql/handler 24 ->>>>>>> merge-perfschema-5.7 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 user3 wait/io/table/sql/handler 70 -user3 wait/lock/table/sql/handler 18 +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 113 +localhost wait/io/table/sql/handler 103 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 113 +wait/io/table/sql/handler 103 wait/lock/table/sql/handler 84 -======= -localhost wait/io/table/sql/handler 102 -localhost wait/lock/table/sql/handler 42 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 102 -wait/lock/table/sql/handler 42 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD -TABLE test t1 NULL 18 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 NULL 17 11 6 11 2 4 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 8 2 6 2 0 6 0 -TABLE test t2 NULL 22 18 4 18 4 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 0 +TABLE test t2 NULL 30 18 12 18 4 8 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 10 2 8 2 0 8 0 -TABLE test t3 NULL 32 26 6 26 6 0 0 +TABLE test t2 PRIMARY 2 2 0 2 0 0 0 +TABLE test t3 NULL 44 26 18 26 6 12 0 TABLE test t3 index_b 4 4 0 4 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 14 2 12 2 0 12 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 23 15 8 15 2 6 0 -TABLE test t2 36 24 12 24 4 8 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t2 32 20 12 20 4 8 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external -TABLE test t1 12 5 7 0 0 0 0 5 0 7 -TABLE test t2 14 5 9 0 0 0 0 5 0 9 -TABLE test t3 16 5 11 0 0 0 0 5 0 11 +TABLE test t1 24 10 14 4 0 0 1 5 0 7 +TABLE test t2 28 10 18 4 0 0 1 5 0 9 +TABLE test t3 32 10 22 4 0 0 1 5 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 47 -TABLE test t2 64 -TABLE test t3 86 -======= -TABLE test t1 32 -TABLE test t2 46 -TABLE test t3 66 ->>>>>>> merge-perfschema-5.7 +TABLE test t1 45 +TABLE test t2 60 +TABLE test t3 82 truncate performance_schema.events_waits_summary_by_user_by_event_name; "================== BY_USER truncated ==================" "================== Step 19 ==================" @@ -2274,69 +1562,43 @@ 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 113 +localhost wait/io/table/sql/handler 103 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 113 +wait/io/table/sql/handler 103 wait/lock/table/sql/handler 84 -======= -localhost wait/io/table/sql/handler 102 -localhost wait/lock/table/sql/handler 42 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 102 -wait/lock/table/sql/handler 42 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD -TABLE test t1 NULL 18 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 NULL 17 11 6 11 2 4 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 8 2 6 2 0 6 0 -TABLE test t2 NULL 22 18 4 18 4 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 0 +TABLE test t2 NULL 30 18 12 18 4 8 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 10 2 8 2 0 8 0 -TABLE test t3 NULL 32 26 6 26 6 0 0 +TABLE test t2 PRIMARY 2 2 0 2 0 0 0 +TABLE test t3 NULL 44 26 18 26 6 12 0 TABLE test t3 index_b 4 4 0 4 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 14 2 12 2 0 12 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 23 15 8 15 2 6 0 -TABLE test t2 36 24 12 24 4 8 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t2 32 20 12 20 4 8 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external -TABLE test t1 12 5 7 0 0 0 0 5 0 7 -TABLE test t2 14 5 9 0 0 0 0 5 0 9 -TABLE test t3 16 5 11 0 0 0 0 5 0 11 +TABLE test t1 24 10 14 4 0 0 1 5 0 7 +TABLE test t2 28 10 18 4 0 0 1 5 0 9 +TABLE test t3 32 10 22 4 0 0 1 5 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 47 -TABLE test t2 64 -TABLE test t3 86 -======= -TABLE test t1 32 -TABLE test t2 46 -TABLE test t3 66 ->>>>>>> merge-perfschema-5.7 +TABLE test t1 45 +TABLE test t2 60 +TABLE test t3 82 truncate performance_schema.events_waits_summary_by_host_by_event_name; "================== BY_HOST truncated ==================" "================== Step 21 ==================" @@ -2375,61 +1637,39 @@ 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 113 +wait/io/table/sql/handler 103 wait/lock/table/sql/handler 84 -======= -wait/io/table/sql/handler 102 -wait/lock/table/sql/handler 42 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -<<<<<<< HEAD -TABLE test t1 NULL 18 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 NULL 17 11 6 11 2 4 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 8 2 6 2 0 6 0 -TABLE test t2 NULL 22 18 4 18 4 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 0 +TABLE test t2 NULL 30 18 12 18 4 8 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 10 2 8 2 0 8 0 -TABLE test t3 NULL 32 26 6 26 6 0 0 +TABLE test t2 PRIMARY 2 2 0 2 0 0 0 +TABLE test t3 NULL 44 26 18 26 6 12 0 TABLE test t3 index_b 4 4 0 4 0 0 0 TABLE test t3 index_cb 0 0 0 0 0 0 0 -TABLE test t3 PRIMARY 14 2 12 2 0 12 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 23 15 8 15 2 6 0 -TABLE test t2 36 24 12 24 4 8 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t2 32 20 12 20 4 8 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external -TABLE test t1 12 5 7 0 0 0 0 5 0 7 -TABLE test t2 14 5 9 0 0 0 0 5 0 9 -TABLE test t3 16 5 11 0 0 0 0 5 0 11 +TABLE test t1 24 10 14 4 0 0 1 5 0 7 +TABLE test t2 28 10 18 4 0 0 1 5 0 9 +TABLE test t3 32 10 22 4 0 0 1 5 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 47 -TABLE test t2 64 -TABLE test t3 86 -======= -TABLE test t1 32 -TABLE test t2 46 -TABLE test t3 66 ->>>>>>> merge-perfschema-5.7 +TABLE test t1 45 +TABLE test t2 60 +TABLE test t3 82 truncate performance_schema.events_waits_summary_global_by_event_name; "================== GLOBAL truncated ==================" "================== Step 21 ==================" |