diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result | 1206 |
1 files changed, 218 insertions, 988 deletions
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result index 133ff7fb046..1b0ba5e2235 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.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_instruments set enabled='NO' where name='wait/lock/table/sql/handler'; delete from performance_schema.setup_actors @@ -54,85 +42,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 @@ -265,19 +174,11 @@ 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 25 -======= -"================== con1 marker ==================" "================== Step 3-A ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 username status user2 not found @@ -287,89 +188,55 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 25 +user1 localhost wait/io/table/sql/handler 23 user1 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 25 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 25 +localhost wait/io/table/sql/handler 23 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 25 +wait/io/table/sql/handler 23 wait/lock/table/sql/handler 0 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/io/table/sql/handler 17 TABLE test t3 -execute dump_waits_index_io; -object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 6 4 2 4 1 1 0 -======= -user1 localhost wait/io/table/sql/handler 22 -user1 localhost wait/lock/table/sql/handler 0 -execute dump_waits_user; -user event_name count_star -user1 wait/io/table/sql/handler 22 -user1 wait/lock/table/sql/handler 0 -execute dump_waits_host; -host event_name count_star -localhost wait/io/table/sql/handler 22 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 22 -wait/lock/table/sql/handler 0 -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/io/table/sql/handler 15 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 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 t3 NULL 10 7 3 7 3 0 0 +TABLE test t1 PRIMARY 2 1 1 1 0 1 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 0 0 0 0 0 0 0 -TABLE test t3 17 11 6 11 3 3 0 -======= -TABLE test t1 7 4 3 4 1 2 0 TABLE test t3 15 9 6 9 3 3 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD TABLE test t1 8 TABLE test t2 0 -TABLE test t3 17 -connect con2, localhost, user2, , ; -======= -TABLE test t1 7 -TABLE test t2 0 TABLE test t3 15 +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 22 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 username status user2 not found @@ -379,37 +246,37 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 22 +user1 localhost wait/io/table/sql/handler 23 user1 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 22 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 22 +localhost wait/io/table/sql/handler 23 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 22 +wait/io/table/sql/handler 23 wait/lock/table/sql/handler 0 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/io/table/sql/handler 8 TABLE test t1 wait/io/table/sql/handler 15 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 t3 NULL 10 7 3 7 3 0 0 +TABLE test t1 PRIMARY 2 1 1 1 0 1 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 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 @@ -417,10 +284,10 @@ TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 7 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 15 ->>>>>>> merge-perfschema-5.7 +connect con2, localhost, user2, , ; select concat(current_user(), " is connected") as status; status user2@localhost is connected @@ -428,11 +295,7 @@ connection default; "================== Step 4 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -443,88 +306,52 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 25 -======= -user1 localhost wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 localhost wait/io/table/sql/handler 23 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 25 +localhost wait/io/table/sql/handler 23 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 25 +wait/io/table/sql/handler 23 wait/lock/table/sql/handler 0 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/io/table/sql/handler 17 TABLE test t3 -execute dump_waits_index_io; -object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 6 4 2 4 1 1 0 -======= -localhost wait/io/table/sql/handler 22 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 22 -wait/lock/table/sql/handler 0 -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/io/table/sql/handler 15 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 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 t3 NULL 10 7 3 7 3 0 0 +TABLE test t1 PRIMARY 2 1 1 1 0 1 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 0 0 0 0 0 0 0 -TABLE test t3 17 11 6 11 3 3 0 -======= -TABLE test t1 7 4 3 4 1 2 0 TABLE test t3 15 9 6 9 3 3 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD TABLE test t1 8 TABLE test t2 0 -TABLE test t3 17 -connection con2; -======= -TABLE test t1 7 -TABLE test t2 0 TABLE test t3 15 ->>>>>>> merge-perfschema-5.7 +connection con2; 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; @@ -567,11 +394,7 @@ connection default; "================== Step 5 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -582,88 +405,52 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 25 -======= -user1 localhost wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 localhost wait/io/table/sql/handler 23 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 25 +localhost wait/io/table/sql/handler 23 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 25 +wait/io/table/sql/handler 23 wait/lock/table/sql/handler 0 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/io/table/sql/handler 17 TABLE test t3 -execute dump_waits_index_io; -object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 6 4 2 4 1 1 0 -======= -localhost wait/io/table/sql/handler 22 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 22 -wait/lock/table/sql/handler 0 -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/io/table/sql/handler 15 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 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 t3 NULL 10 7 3 7 3 0 0 +TABLE test t1 PRIMARY 2 1 1 1 0 1 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 0 0 0 0 0 0 0 -TABLE test t3 17 11 6 11 3 3 0 -======= -TABLE test t1 7 4 3 4 1 2 0 TABLE test t3 15 9 6 9 3 3 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD TABLE test t1 8 TABLE test t2 0 -TABLE test t3 17 -connect con3, localhost, user3, , ; -======= -TABLE test t1 7 -TABLE test t2 0 TABLE test t3 15 ->>>>>>> merge-perfschema-5.7 +connect con3, localhost, user3, , ; select concat(current_user(), " is connected") as status; status user3@localhost is connected @@ -671,11 +458,7 @@ connection default; "================== Step 6 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -687,11 +470,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 25 -======= -user1 localhost wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 localhost wait/io/table/sql/handler 23 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -699,11 +478,7 @@ user3 localhost wait/io/table/sql/handler 0 user3 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -711,68 +486,40 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 25 +localhost wait/io/table/sql/handler 23 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 25 +wait/io/table/sql/handler 23 wait/lock/table/sql/handler 0 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/io/table/sql/handler 17 TABLE test t3 -execute dump_waits_index_io; -object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 6 4 2 4 1 1 0 -======= -localhost wait/io/table/sql/handler 22 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 22 -wait/lock/table/sql/handler 0 -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/io/table/sql/handler 15 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 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 t3 NULL 10 7 3 7 3 0 0 +TABLE test t1 PRIMARY 2 1 1 1 0 1 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 0 0 0 0 0 0 0 -TABLE test t3 17 11 6 11 3 3 0 -======= -TABLE test t1 7 4 3 4 1 2 0 TABLE test t3 15 9 6 9 3 3 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD TABLE test t1 8 TABLE test t2 0 -TABLE test t3 17 -connection con3; -======= -TABLE test t1 7 -TABLE test t2 0 TABLE test t3 15 ->>>>>>> merge-perfschema-5.7 +connection con3; 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; @@ -822,11 +569,7 @@ connection default; "================== Step 7 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -838,11 +581,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 25 -======= -user1 localhost wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 localhost wait/io/table/sql/handler 23 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -850,11 +589,7 @@ user3 localhost wait/io/table/sql/handler 48 user3 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -862,69 +597,40 @@ user3 wait/io/table/sql/handler 48 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 77 +localhost wait/io/table/sql/handler 71 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 77 +wait/io/table/sql/handler 71 wait/lock/table/sql/handler 0 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 23 TABLE test t1 -wait/io/table/sql/handler 54 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 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -localhost wait/io/table/sql/handler 70 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 70 -wait/lock/table/sql/handler 0 -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 21 TABLE test t1 wait/io/table/sql/handler 50 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 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 t3 NULL 32 26 6 26 6 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 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 0 0 0 0 0 0 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 23 -TABLE test t2 0 -TABLE test t3 54 -connect con4, localhost, user4, , ; -======= -TABLE test t1 20 +TABLE test t1 21 TABLE test t2 0 TABLE test t3 50 ->>>>>>> merge-perfschema-5.7 +connect con4, localhost, user4, , ; select concat(current_user(), " is connected") as status; status user4@localhost is connected @@ -932,11 +638,7 @@ connection default; "================== Step 8 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -949,11 +651,7 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 25 -======= -user1 localhost wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 localhost wait/io/table/sql/handler 23 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -963,11 +661,7 @@ user4 localhost wait/io/table/sql/handler 0 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -977,69 +671,40 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 77 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 77 -wait/lock/table/sql/handler 0 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 23 TABLE test t1 -wait/io/table/sql/handler 54 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 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -localhost wait/io/table/sql/handler 70 +localhost wait/io/table/sql/handler 71 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 70 +wait/io/table/sql/handler 71 wait/lock/table/sql/handler 0 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 21 TABLE test t1 wait/io/table/sql/handler 50 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 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 t3 NULL 32 26 6 26 6 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 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 0 0 0 0 0 0 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 23 -TABLE test t2 0 -TABLE test t3 54 -connection con4; -======= -TABLE test t1 20 +TABLE test t1 21 TABLE test t2 0 TABLE test t3 50 ->>>>>>> merge-perfschema-5.7 +connection con4; 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; @@ -1096,11 +761,7 @@ connection default; "================== Step 9 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -1113,11 +774,7 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 25 -======= -user1 localhost wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 localhost wait/io/table/sql/handler 23 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1127,11 +784,7 @@ user4 localhost wait/io/table/sql/handler 0 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1141,69 +794,40 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 77 +localhost wait/io/table/sql/handler 71 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 77 +wait/io/table/sql/handler 71 wait/lock/table/sql/handler 0 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 23 TABLE test t1 -wait/io/table/sql/handler 54 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 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -localhost wait/io/table/sql/handler 70 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 70 -wait/lock/table/sql/handler 0 -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 21 TABLE test t1 wait/io/table/sql/handler 50 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 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 t3 NULL 32 26 6 26 6 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 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 0 0 0 0 0 0 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 23 -TABLE test t2 0 -TABLE test t3 54 -connection con1; -======= -TABLE test t1 20 +TABLE test t1 21 TABLE test t2 0 TABLE test t3 50 ->>>>>>> merge-perfschema-5.7 +connection con1; lock tables test.t1 read, test.t2 read, test.t3 read; unlock tables; lock tables test.t1 write, test.t2 write, test.t3 write; @@ -1212,11 +836,7 @@ connection default; "================== Step 10 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -1229,11 +849,7 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 25 -======= -user1 localhost wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 localhost wait/io/table/sql/handler 23 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1243,11 +859,7 @@ user4 localhost wait/io/table/sql/handler 0 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1257,79 +869,46 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 77 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 77 -wait/lock/table/sql/handler 0 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 23 TABLE test t1 -wait/io/table/sql/handler 54 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 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -localhost wait/io/table/sql/handler 70 +localhost wait/io/table/sql/handler 71 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 70 +wait/io/table/sql/handler 71 wait/lock/table/sql/handler 0 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 21 TABLE test t1 wait/io/table/sql/handler 50 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 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 t3 NULL 32 26 6 26 6 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 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 0 0 0 0 0 0 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 23 -TABLE test t2 0 -TABLE test t3 54 -connection default; -======= -TABLE test t1 20 +TABLE test t1 21 TABLE test t2 0 TABLE test t3 50 ->>>>>>> merge-perfschema-5.7 +connection default; flush tables; "================== flush marker ==================" "================== Step 11 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -1342,11 +921,7 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 25 -======= -user1 localhost wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 localhost wait/io/table/sql/handler 23 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1356,11 +931,7 @@ user4 localhost wait/io/table/sql/handler 0 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1370,64 +941,37 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 77 +localhost wait/io/table/sql/handler 71 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 77 +wait/io/table/sql/handler 71 wait/lock/table/sql/handler 0 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 23 TABLE test t1 -wait/io/table/sql/handler 54 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 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -localhost wait/io/table/sql/handler 70 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 70 -wait/lock/table/sql/handler 0 -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 21 TABLE test t1 wait/io/table/sql/handler 50 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 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 t3 NULL 32 26 6 26 6 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 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 0 0 0 0 0 0 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 23 -======= -TABLE test t1 20 ->>>>>>> merge-perfschema-5.7 +TABLE test t1 21 TABLE test t2 0 TABLE test t3 50 set global read_only=1; @@ -1436,11 +980,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -1453,11 +993,7 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 25 -======= -user1 localhost wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 localhost wait/io/table/sql/handler 23 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1467,11 +1003,7 @@ user4 localhost wait/io/table/sql/handler 0 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1481,70 +1013,40 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 77 +localhost wait/io/table/sql/handler 71 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 77 +wait/io/table/sql/handler 71 wait/lock/table/sql/handler 0 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 23 TABLE test t1 -wait/io/table/sql/handler 54 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 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -localhost wait/io/table/sql/handler 70 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 70 -wait/lock/table/sql/handler 0 -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 21 TABLE test t1 wait/io/table/sql/handler 50 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 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 t3 NULL 32 26 6 26 6 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 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 0 0 0 0 0 0 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 23 -TABLE test t2 0 -TABLE test t3 54 -disconnect con1; -======= -TABLE test t1 20 +TABLE test t1 21 TABLE test t2 0 TABLE test t3 50 -"================== con1 disconnected ==================" ->>>>>>> merge-perfschema-5.7 +disconnect con1; "================== Step 13 ==================" call dump_thread(); username status @@ -1560,11 +1062,7 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 25 -======= -user1 localhost wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 localhost wait/io/table/sql/handler 23 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1574,11 +1072,7 @@ user4 localhost wait/io/table/sql/handler 0 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1588,70 +1082,40 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 77 +localhost wait/io/table/sql/handler 71 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 77 +wait/io/table/sql/handler 71 wait/lock/table/sql/handler 0 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 23 TABLE test t1 -wait/io/table/sql/handler 54 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 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -localhost wait/io/table/sql/handler 70 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 70 -wait/lock/table/sql/handler 0 -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 21 TABLE test t1 wait/io/table/sql/handler 50 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 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 t3 NULL 32 26 6 26 6 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 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 0 0 0 0 0 0 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 23 -TABLE test t2 0 -TABLE test t3 54 -disconnect con2; -======= -TABLE test t1 20 +TABLE test t1 21 TABLE test t2 0 TABLE test t3 50 -"================== con2 disconnected ==================" ->>>>>>> merge-perfschema-5.7 +disconnect con2; "================== Step 14 ==================" call dump_thread(); username status @@ -1666,11 +1130,7 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 25 -======= -user1 localhost wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 localhost wait/io/table/sql/handler 23 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1680,11 +1140,7 @@ user4 localhost wait/io/table/sql/handler 0 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1694,70 +1150,40 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 77 +localhost wait/io/table/sql/handler 71 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 77 +wait/io/table/sql/handler 71 wait/lock/table/sql/handler 0 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 23 TABLE test t1 -wait/io/table/sql/handler 54 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 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -localhost wait/io/table/sql/handler 70 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 70 -wait/lock/table/sql/handler 0 -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 21 TABLE test t1 wait/io/table/sql/handler 50 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 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 t3 NULL 32 26 6 26 6 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 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 0 0 0 0 0 0 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 23 -TABLE test t2 0 -TABLE test t3 54 -disconnect con3; -======= -TABLE test t1 20 +TABLE test t1 21 TABLE test t2 0 TABLE test t3 50 -"================== con3 disconnected ==================" ->>>>>>> merge-perfschema-5.7 +disconnect con3; "================== Step 15 ==================" call dump_thread(); username status @@ -1771,11 +1197,7 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 25 -======= -user1 localhost wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 localhost wait/io/table/sql/handler 23 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1785,11 +1207,7 @@ user4 localhost wait/io/table/sql/handler 0 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1799,70 +1217,40 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 77 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 77 -wait/lock/table/sql/handler 0 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 23 TABLE test t1 -wait/io/table/sql/handler 54 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 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -localhost wait/io/table/sql/handler 70 +localhost wait/io/table/sql/handler 71 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 70 +wait/io/table/sql/handler 71 wait/lock/table/sql/handler 0 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 21 TABLE test t1 wait/io/table/sql/handler 50 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 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 t3 NULL 32 26 6 26 6 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 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 0 0 0 0 0 0 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 23 -TABLE test t2 0 -TABLE test t3 54 -disconnect con4; -======= -TABLE test t1 20 +TABLE test t1 21 TABLE test t2 0 TABLE test t3 50 -"================== con4 disconnected ==================" ->>>>>>> merge-perfschema-5.7 +disconnect con4; "================== Step 16 ==================" call dump_thread(); username status @@ -1875,11 +1263,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 25 -======= -user1 localhost wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 localhost wait/io/table/sql/handler 23 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1889,11 +1273,7 @@ user4 localhost wait/io/table/sql/handler 0 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1903,69 +1283,40 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 77 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 77 -wait/lock/table/sql/handler 0 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 23 TABLE test t1 -wait/io/table/sql/handler 54 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 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -localhost wait/io/table/sql/handler 70 +localhost wait/io/table/sql/handler 71 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 70 +wait/io/table/sql/handler 71 wait/lock/table/sql/handler 0 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 21 TABLE test t1 wait/io/table/sql/handler 50 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 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 t3 NULL 32 26 6 26 6 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 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 0 0 0 0 0 0 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 23 -TABLE test t2 0 -TABLE test t3 54 -connection default; -======= -TABLE test t1 20 +TABLE test t1 21 TABLE test t2 0 TABLE test t3 50 ->>>>>>> merge-perfschema-5.7 +connection default; truncate performance_schema.events_waits_summary_by_thread_by_event_name; "================== BY_THREAD truncated ==================" "================== Step 17 ==================" @@ -1980,11 +1331,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/table/sql/handler 25 -======= -user1 localhost wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 localhost wait/io/table/sql/handler 23 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1994,11 +1341,7 @@ user4 localhost wait/io/table/sql/handler 0 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -2008,64 +1351,37 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 77 +localhost wait/io/table/sql/handler 71 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 77 +wait/io/table/sql/handler 71 wait/lock/table/sql/handler 0 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 23 TABLE test t1 -wait/io/table/sql/handler 54 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 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -localhost wait/io/table/sql/handler 70 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 70 -wait/lock/table/sql/handler 0 -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 21 TABLE test t1 wait/io/table/sql/handler 50 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 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 t3 NULL 32 26 6 26 6 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 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 0 0 0 0 0 0 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 23 -======= -TABLE test t1 20 ->>>>>>> merge-perfschema-5.7 +TABLE test t1 21 TABLE test t2 0 TABLE test t3 50 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -2092,11 +1408,7 @@ user4 localhost wait/io/table/sql/handler 0 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/table/sql/handler 25 -======= -user1 wait/io/table/sql/handler 22 ->>>>>>> merge-perfschema-5.7 +user1 wait/io/table/sql/handler 23 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -2106,64 +1418,37 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 77 +localhost wait/io/table/sql/handler 71 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 77 +wait/io/table/sql/handler 71 wait/lock/table/sql/handler 0 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 23 TABLE test t1 -wait/io/table/sql/handler 54 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 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -localhost wait/io/table/sql/handler 70 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 70 -wait/lock/table/sql/handler 0 -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 21 TABLE test t1 wait/io/table/sql/handler 50 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 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 t3 NULL 32 26 6 26 6 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 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 0 0 0 0 0 0 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 23 -======= -TABLE test t1 20 ->>>>>>> merge-perfschema-5.7 +TABLE test t1 21 TABLE test t2 0 TABLE test t3 50 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -2200,64 +1485,37 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/table/sql/handler 77 -localhost wait/lock/table/sql/handler 0 -execute dump_waits_global; -event_name count_star -wait/io/table/sql/handler 77 -wait/lock/table/sql/handler 0 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 23 TABLE test t1 -wait/io/table/sql/handler 54 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 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -localhost wait/io/table/sql/handler 70 +localhost wait/io/table/sql/handler 71 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 70 +wait/io/table/sql/handler 71 wait/lock/table/sql/handler 0 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 21 TABLE test t1 wait/io/table/sql/handler 50 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 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 t3 NULL 32 26 6 26 6 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 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 0 0 0 0 0 0 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 23 -======= -TABLE test t1 20 ->>>>>>> merge-perfschema-5.7 +TABLE test t1 21 TABLE test t2 0 TABLE test t3 50 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -2298,56 +1556,33 @@ localhost wait/io/table/sql/handler 0 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/table/sql/handler 77 -wait/lock/table/sql/handler 0 -execute dump_waits_history; -event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 23 TABLE test t1 -wait/io/table/sql/handler 54 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 12 6 12 2 4 0 -TABLE test t1 index_b 1 1 0 1 0 0 0 -======= -wait/io/table/sql/handler 70 +wait/io/table/sql/handler 71 wait/lock/table/sql/handler 0 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 21 TABLE test t1 wait/io/table/sql/handler 50 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 12 10 2 10 2 0 0 +TABLE test t1 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 t3 NULL 32 26 6 26 6 0 0 +TABLE test t1 PRIMARY 4 2 2 2 0 2 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 0 0 0 0 0 0 0 -TABLE test t3 54 36 18 36 6 12 0 -======= -TABLE test t1 20 12 8 12 2 6 0 +TABLE test t1 21 13 8 13 2 6 0 TABLE test t3 50 32 18 32 6 12 0 ->>>>>>> merge-perfschema-5.7 execute dump_waits_table_lock; object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external TABLE test t1 0 0 0 0 0 0 0 0 0 0 TABLE test t3 0 0 0 0 0 0 0 0 0 0 execute dump_objects_summary; object_type object_schema object_name count_star -<<<<<<< HEAD -TABLE test t1 23 -======= -TABLE test t1 20 ->>>>>>> merge-perfschema-5.7 +TABLE test t1 21 TABLE test t2 0 TABLE test t3 50 truncate performance_schema.events_waits_summary_global_by_event_name; @@ -2392,13 +1627,8 @@ wait/io/table/sql/handler 0 wait/lock/table/sql/handler 0 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -<<<<<<< HEAD -wait/io/table/sql/handler 23 TABLE test t1 -wait/io/table/sql/handler 54 TABLE test t3 -======= -wait/io/table/sql/handler 20 TABLE test t1 +wait/io/table/sql/handler 21 TABLE test t1 wait/io/table/sql/handler 50 TABLE test t3 ->>>>>>> merge-perfschema-5.7 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete TABLE test t1 NULL 0 0 0 0 0 0 0 |