summaryrefslogtreecommitdiff
path: root/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result')
-rw-r--r--mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result954
1 files changed, 686 insertions, 268 deletions
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
index dfaa91a3fbc..a51f575edf5 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
@@ -1,3 +1,15 @@
+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='thread_instrumentation';
delete from performance_schema.setup_actors
@@ -6,9 +18,9 @@ delete from performance_schema.setup_objects
where object_name='t2';
select * from performance_schema.setup_actors
order by USER, HOST, ROLE;
-HOST USER ROLE
-localhost user1 %
-localhost user3 %
+HOST USER ROLE ENABLED HISTORY
+localhost user1 % YES YES
+localhost user3 % YES YES
select * from performance_schema.setup_objects
order by object_type, object_schema, object_name;
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME ENABLED TIMED
@@ -22,6 +34,9 @@ events_stages_history_long YES
events_statements_current YES
events_statements_history YES
events_statements_history_long YES
+events_transactions_current YES
+events_transactions_history YES
+events_transactions_history_long YES
events_waits_current YES
events_waits_history YES
events_waits_history_long YES
@@ -39,6 +54,85 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
truncate performance_schema.events_waits_summary_by_host_by_event_name;
truncate performance_schema.events_waits_summary_global_by_event_name;
truncate performance_schema.events_waits_history_long;
+<<<<<<< HEAD
+=======
+show global variables like "performance_schema%";
+Variable_name Value
+performance_schema ON
+performance_schema_accounts_size 100
+performance_schema_digests_size 200
+performance_schema_events_stages_history_long_size 1000
+performance_schema_events_stages_history_size 10
+performance_schema_events_statements_history_long_size 1000
+performance_schema_events_statements_history_size 10
+performance_schema_events_transactions_history_long_size 1000
+performance_schema_events_transactions_history_size 10
+performance_schema_events_waits_history_long_size 10000
+performance_schema_events_waits_history_size 10
+performance_schema_hosts_size 100
+performance_schema_max_cond_classes 80
+performance_schema_max_cond_instances 1000
+performance_schema_max_digest_length 1024
+performance_schema_max_file_classes 80
+performance_schema_max_file_handles 32768
+performance_schema_max_file_instances 10000
+performance_schema_max_index_stat 5000
+performance_schema_max_memory_classes 320
+performance_schema_max_metadata_locks 10000
+performance_schema_max_mutex_classes 210
+performance_schema_max_mutex_instances 5000
+performance_schema_max_prepared_statements_instances 100
+performance_schema_max_program_instances 5000
+performance_schema_max_rwlock_classes 50
+performance_schema_max_rwlock_instances 5000
+performance_schema_max_socket_classes 10
+performance_schema_max_socket_instances 1000
+performance_schema_max_sql_text_length 1024
+performance_schema_max_stage_classes 150
+performance_schema_max_statement_classes 193
+performance_schema_max_statement_stack 10
+performance_schema_max_table_handles 1000
+performance_schema_max_table_instances 500
+performance_schema_max_table_lock_stat 500
+performance_schema_max_thread_classes 50
+performance_schema_max_thread_instances 200
+performance_schema_session_connect_attrs_size 2048
+performance_schema_setup_actors_size 100
+performance_schema_setup_objects_size 100
+performance_schema_users_size 100
+show global status like "performance_schema%";
+Variable_name Value
+Performance_schema_accounts_lost 0
+Performance_schema_cond_classes_lost 0
+Performance_schema_cond_instances_lost 0
+Performance_schema_digest_lost 0
+Performance_schema_file_classes_lost 0
+Performance_schema_file_handles_lost 0
+Performance_schema_file_instances_lost 0
+Performance_schema_hosts_lost 0
+Performance_schema_index_stat_lost 0
+Performance_schema_locker_lost 0
+Performance_schema_memory_classes_lost 0
+Performance_schema_metadata_lock_lost 0
+Performance_schema_mutex_classes_lost 0
+Performance_schema_mutex_instances_lost 0
+Performance_schema_nested_statement_lost 0
+Performance_schema_prepared_statements_lost 0
+Performance_schema_program_lost 0
+Performance_schema_rwlock_classes_lost 0
+Performance_schema_rwlock_instances_lost 0
+Performance_schema_session_connect_attrs_lost 0
+Performance_schema_socket_classes_lost 0
+Performance_schema_socket_instances_lost 0
+Performance_schema_stage_classes_lost 0
+Performance_schema_statement_classes_lost 0
+Performance_schema_table_handles_lost 0
+Performance_schema_table_instances_lost 0
+Performance_schema_table_lock_stat_lost 0
+Performance_schema_thread_classes_lost 0
+Performance_schema_thread_instances_lost 0
+Performance_schema_users_lost 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
"================== Step 1 =================="
call dump_thread();
username status
@@ -65,28 +159,20 @@ execute dump_waits_history;
event_name count(event_name) object_type object_schema object_name
execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
-TABLE test t1 NULL 0 0 0 0 0 0 0
TABLE test t1 index_b 0 0 0 0 0 0 0
TABLE test t1 index_cb 0 0 0 0 0 0 0
TABLE test t1 PRIMARY 0 0 0 0 0 0 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 0 0 0 0 0 0 0
TABLE test t3 index_b 0 0 0 0 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
TABLE test t3 PRIMARY 0 0 0 0 0 0 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 0 0 0 0 0 0 0
-TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 0 0 0 0 0 0 0
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 0 0 0 0 0 0 0 0 0 0 0
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 0 0 0 0 0 0 0 0 0 0
+TABLE test t3 0 0 0 0 0 0 0 0 0 0
execute dump_objects_summary;
object_type object_schema object_name count_star
TABLE test t1 0
@@ -128,28 +214,20 @@ execute dump_waits_history;
event_name count(event_name) object_type object_schema object_name
execute dump_waits_index_io;
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
-TABLE test t1 NULL 0 0 0 0 0 0 0
TABLE test t1 index_b 0 0 0 0 0 0 0
TABLE test t1 index_cb 0 0 0 0 0 0 0
TABLE test t1 PRIMARY 0 0 0 0 0 0 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 0 0 0 0 0 0 0
TABLE test t3 index_b 0 0 0 0 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
TABLE test t3 PRIMARY 0 0 0 0 0 0 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 0 0 0 0 0 0 0
-TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 0 0 0 0 0 0 0
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 0 0 0 0 0 0 0 0 0 0 0
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 0 0 0 0 0 0 0 0 0 0
+TABLE test t3 0 0 0 0 0 0 0 0 0 0
execute dump_objects_summary;
object_type object_schema object_name count_star
TABLE test t1 0
@@ -180,15 +258,20 @@ update test.t3 set d=d+1;
update test.t1 set d=d+1 where a=101;
update test.t2 set d=d+1 where a=101;
update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
a b c d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
a b c d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
a b c d
105 5 5 1
+<<<<<<< HEAD
connection default;
"================== Step 3 =================="
+=======
+"================== con1 marker =================="
+"================== Step 3-A =================="
+>>>>>>> merge-perfschema-5.7
call dump_thread();
username event_name count_star
user1 wait/io/table/sql/handler 0
@@ -213,40 +296,109 @@ 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 25
wait/lock/table/sql/handler 24
+=======
+wait/io/table/sql/handler 22
+wait/lock/table/sql/handler 12
+>>>>>>> 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 2 1 1 1 0 1 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 14 8 6 8 3 3 0
-TABLE test t3 index_b 2 2 0 2 0 0 0
+TABLE test t1 PRIMARY 3 1 2 1 0 2 0
+TABLE test t3 NULL 10 7 3 7 3 0 0
+TABLE test t3 index_b 1 1 0 1 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 1 1 0 1 0 0 0
+TABLE test t3 PRIMARY 4 1 3 1 0 3 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 8 5 3 5 1 2 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 17 11 6 11 3 3 0
+=======
+TABLE test t1 7 4 3 4 1 2 0
+TABLE test t3 15 9 6 9 3 3 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 10 4 6 2 0 0 0 2 0 0 3
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 14 4 10 2 0 0 0 2 0 0 5
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 5 2 3 0 0 0 0 2 0 3
+TABLE test t3 7 2 5 0 0 0 0 2 0 5
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 18
TABLE test t2 0
TABLE test t3 31
connect con2, localhost, user2, , ;
+=======
+TABLE test t1 12
+TABLE test t2 0
+TABLE test t3 22
+flush tables;
+"================== con1 FLUSH =================="
+"================== Step 3-B =================="
+call dump_thread();
+username event_name count_star
+user1 wait/io/table/sql/handler 0
+user1 wait/lock/table/sql/handler 0
+username status
+user2 not found
+username status
+user3 not found
+username status
+user4 not found
+execute dump_waits_account;
+user host event_name count_star
+user1 localhost wait/io/table/sql/handler 0
+user1 localhost wait/lock/table/sql/handler 0
+execute dump_waits_user;
+user event_name count_star
+user1 wait/io/table/sql/handler 0
+user1 wait/lock/table/sql/handler 0
+execute dump_waits_host;
+host event_name count_star
+localhost wait/io/table/sql/handler 0
+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 12
+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 index_b 0 0 0 0 0 0 0
+TABLE test t1 index_cb 0 0 0 0 0 0 0
+TABLE test t1 PRIMARY 3 1 2 1 0 2 0
+TABLE test t3 NULL 10 7 3 7 3 0 0
+TABLE test t3 index_b 1 1 0 1 0 0 0
+TABLE test t3 index_cb 0 0 0 0 0 0 0
+TABLE test t3 PRIMARY 4 1 3 1 0 3 0
+execute dump_waits_table_io;
+object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+TABLE test t1 7 4 3 4 1 2 0
+TABLE test t3 15 9 6 9 3 3 0
+execute dump_waits_table_lock;
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 5 2 3 0 0 0 0 2 0 3
+TABLE test t3 7 2 5 0 0 0 0 2 0 5
+execute dump_objects_summary;
+object_type object_schema object_name count_star
+TABLE test t1 12
+TABLE test t2 0
+TABLE test t3 22
+>>>>>>> merge-perfschema-5.7
select concat(current_user(), " is connected") as status;
status
user2@localhost is connected
@@ -281,40 +433,55 @@ 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 25
wait/lock/table/sql/handler 24
+=======
+wait/io/table/sql/handler 22
+wait/lock/table/sql/handler 12
+>>>>>>> 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 2 1 1 1 0 1 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 14 8 6 8 3 3 0
-TABLE test t3 index_b 2 2 0 2 0 0 0
+TABLE test t1 PRIMARY 3 1 2 1 0 2 0
+TABLE test t3 NULL 10 7 3 7 3 0 0
+TABLE test t3 index_b 1 1 0 1 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 1 1 0 1 0 0 0
+TABLE test t3 PRIMARY 4 1 3 1 0 3 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 8 5 3 5 1 2 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 17 11 6 11 3 3 0
+=======
+TABLE test t1 7 4 3 4 1 2 0
+TABLE test t3 15 9 6 9 3 3 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 10 4 6 2 0 0 0 2 0 0 3
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 14 4 10 2 0 0 0 2 0 0 5
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 5 2 3 0 0 0 0 2 0 3
+TABLE test t3 7 2 5 0 0 0 0 2 0 5
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 18
TABLE test t2 0
TABLE test t3 31
connection con2;
+=======
+TABLE test t1 12
+TABLE test t2 0
+TABLE test t3 22
+>>>>>>> merge-perfschema-5.7
insert into test.t1 set a=201, b=1, c=1;
insert into test.t2 set a=202, b=2, c=2;
insert into test.t2 set a=203, b=3, c=3;
@@ -345,11 +512,11 @@ update test.t3 set d=d+1;
update test.t1 set d=d+1 where a=201;
update test.t2 set d=d+1 where a=201;
update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
a b c d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
a b c d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
a b c d
105 5 5 2
205 5 5 1
@@ -384,40 +551,56 @@ 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 64
wait/lock/table/sql/handler 48
+=======
+wait/io/table/sql/handler 57
+wait/lock/table/sql/handler 24
+>>>>>>> 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 15 10 5 10 2 3 0
TABLE test t1 index_b 1 1 0 1 0 0 0
+=======
+TABLE test t1 NULL 10 8 2 8 2 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 4 2 2 2 0 2 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 37 22 15 22 6 9 0
-TABLE test t3 index_b 5 5 0 5 0 0 0
+TABLE test t1 PRIMARY 7 2 5 2 0 5 0
+TABLE test t3 NULL 26 20 6 20 6 0 0
+TABLE test t3 index_b 3 3 0 3 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 2 2 0 2 0 0 0
+TABLE test t3 PRIMARY 11 2 9 2 0 9 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 20 13 7 13 2 5 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 44 29 15 29 6 9 0
+=======
+TABLE test t1 17 10 7 10 2 5 0
+TABLE test t3 40 25 15 25 6 9 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 20 8 12 4 0 0 0 4 0 0 6
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 28 8 20 4 0 0 0 4 0 0 10
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 10 4 6 0 0 0 0 4 0 6
+TABLE test t3 14 4 10 0 0 0 0 4 0 10
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 40
TABLE test t2 0
TABLE test t3 72
connect con3, localhost, user3, , ;
+=======
+TABLE test t1 27
+TABLE test t2 0
+TABLE test t3 54
+>>>>>>> merge-perfschema-5.7
select concat(current_user(), " is connected") as status;
status
user3@localhost is connected
@@ -457,40 +640,56 @@ 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 64
wait/lock/table/sql/handler 48
+=======
+wait/io/table/sql/handler 57
+wait/lock/table/sql/handler 24
+>>>>>>> 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 15 10 5 10 2 3 0
TABLE test t1 index_b 1 1 0 1 0 0 0
+=======
+TABLE test t1 NULL 10 8 2 8 2 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 4 2 2 2 0 2 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 37 22 15 22 6 9 0
-TABLE test t3 index_b 5 5 0 5 0 0 0
+TABLE test t1 PRIMARY 7 2 5 2 0 5 0
+TABLE test t3 NULL 26 20 6 20 6 0 0
+TABLE test t3 index_b 3 3 0 3 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 2 2 0 2 0 0 0
+TABLE test t3 PRIMARY 11 2 9 2 0 9 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 20 13 7 13 2 5 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 44 29 15 29 6 9 0
+=======
+TABLE test t1 17 10 7 10 2 5 0
+TABLE test t3 40 25 15 25 6 9 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 20 8 12 4 0 0 0 4 0 0 6
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 28 8 20 4 0 0 0 4 0 0 10
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 10 4 6 0 0 0 0 4 0 6
+TABLE test t3 14 4 10 0 0 0 0 4 0 10
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 40
TABLE test t2 0
TABLE test t3 72
connection con3;
+=======
+TABLE test t1 27
+TABLE test t2 0
+TABLE test t3 54
+>>>>>>> merge-perfschema-5.7
insert into test.t1 set a=301, b=1, c=1;
insert into test.t2 set a=302, b=2, c=2;
insert into test.t2 set a=303, b=3, c=3;
@@ -527,11 +726,11 @@ update test.t3 set d=d+1;
update test.t1 set d=d+1 where a=301;
update test.t2 set d=d+1 where a=301;
update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
a b c d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
a b c d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
a b c d
105 5 5 3
205 5 5 2
@@ -572,40 +771,56 @@ 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 116
wait/lock/table/sql/handler 72
+=======
+wait/io/table/sql/handler 105
+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 27 18 9 18 3 6 0
TABLE test t1 index_b 2 2 0 2 0 0 0
+=======
+TABLE test t1 NULL 18 15 3 15 3 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 6 3 3 3 0 3 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 69 42 27 42 9 18 0
-TABLE test t3 index_b 9 9 0 9 0 0 0
+TABLE test t1 PRIMARY 12 3 9 3 0 9 0
+TABLE test t3 NULL 48 39 9 39 9 0 0
+TABLE test t3 index_b 6 6 0 6 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 3 3 0 3 0 0 0
+TABLE test t3 PRIMARY 21 3 18 3 0 18 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 35 23 12 23 3 9 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 81 54 27 54 9 18 0
+=======
+TABLE test t1 30 18 12 18 3 9 0
+TABLE test t3 75 48 27 48 9 18 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 30 12 18 6 0 0 0 6 0 0 9
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 42 12 30 6 0 0 0 6 0 0 15
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 15 6 9 0 0 0 0 6 0 9
+TABLE test t3 21 6 15 0 0 0 0 6 0 15
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 65
TABLE test t2 0
TABLE test t3 123
connect con4, localhost, user4, , ;
+=======
+TABLE test t1 45
+TABLE test t2 0
+TABLE test t3 96
+>>>>>>> merge-perfschema-5.7
select concat(current_user(), " is connected") as status;
status
user4@localhost is connected
@@ -650,40 +865,56 @@ 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 116
wait/lock/table/sql/handler 72
+=======
+wait/io/table/sql/handler 105
+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 27 18 9 18 3 6 0
TABLE test t1 index_b 2 2 0 2 0 0 0
+=======
+TABLE test t1 NULL 18 15 3 15 3 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 6 3 3 3 0 3 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 69 42 27 42 9 18 0
-TABLE test t3 index_b 9 9 0 9 0 0 0
+TABLE test t1 PRIMARY 12 3 9 3 0 9 0
+TABLE test t3 NULL 48 39 9 39 9 0 0
+TABLE test t3 index_b 6 6 0 6 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 3 3 0 3 0 0 0
+TABLE test t3 PRIMARY 21 3 18 3 0 18 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 35 23 12 23 3 9 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 81 54 27 54 9 18 0
+=======
+TABLE test t1 30 18 12 18 3 9 0
+TABLE test t3 75 48 27 48 9 18 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 30 12 18 6 0 0 0 6 0 0 9
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 42 12 30 6 0 0 0 6 0 0 15
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 15 6 9 0 0 0 0 6 0 9
+TABLE test t3 21 6 15 0 0 0 0 6 0 15
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 65
TABLE test t2 0
TABLE test t3 123
connection con4;
+=======
+TABLE test t1 45
+TABLE test t2 0
+TABLE test t3 96
+>>>>>>> merge-perfschema-5.7
insert into test.t1 set a=401, b=1, c=1;
insert into test.t2 set a=402, b=2, c=2;
insert into test.t2 set a=403, b=3, c=3;
@@ -726,11 +957,11 @@ update test.t3 set d=d+1;
update test.t1 set d=d+1 where a=401;
update test.t2 set d=d+1 where a=401;
update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
a b c d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
a b c d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
a b c d
105 5 5 4
205 5 5 3
@@ -777,40 +1008,56 @@ 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 181
wait/lock/table/sql/handler 96
+=======
+wait/io/table/sql/handler 166
+wait/lock/table/sql/handler 48
+>>>>>>> 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 42 28 14 28 4 10 0
TABLE test t1 index_b 3 3 0 3 0 0 0
+=======
+TABLE test t1 NULL 28 24 4 24 4 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 8 4 4 4 0 4 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 110 68 42 68 12 30 0
-TABLE test t3 index_b 14 14 0 14 0 0 0
+TABLE test t1 PRIMARY 18 4 14 4 0 14 0
+TABLE test t3 NULL 76 64 12 64 12 0 0
+TABLE test t3 index_b 10 10 0 10 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 4 4 0 4 0 0 0
+TABLE test t3 PRIMARY 34 4 30 4 0 30 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 53 35 18 35 4 14 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 128 86 42 86 12 30 0
+=======
+TABLE test t1 46 28 18 28 4 14 0
+TABLE test t3 120 78 42 78 12 30 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 40 16 24 8 0 0 0 8 0 0 12
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 56 16 40 8 0 0 0 8 0 0 20
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 20 8 12 0 0 0 0 8 0 12
+TABLE test t3 28 8 20 0 0 0 0 8 0 20
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 93
TABLE test t2 0
TABLE test t3 184
connection con1;
+=======
+TABLE test t1 66
+TABLE test t2 0
+TABLE test t3 148
+>>>>>>> merge-perfschema-5.7
lock tables test.t1 read, test.t2 read, test.t3 read;
unlock tables;
lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -856,40 +1103,56 @@ 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 181
wait/lock/table/sql/handler 104
+=======
+wait/io/table/sql/handler 166
+wait/lock/table/sql/handler 52
+>>>>>>> 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 42 28 14 28 4 10 0
TABLE test t1 index_b 3 3 0 3 0 0 0
+=======
+TABLE test t1 NULL 28 24 4 24 4 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 8 4 4 4 0 4 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 110 68 42 68 12 30 0
-TABLE test t3 index_b 14 14 0 14 0 0 0
+TABLE test t1 PRIMARY 18 4 14 4 0 14 0
+TABLE test t3 NULL 76 64 12 64 12 0 0
+TABLE test t3 index_b 10 10 0 10 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 4 4 0 4 0 0 0
+TABLE test t3 PRIMARY 34 4 30 4 0 30 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 53 35 18 35 4 14 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 128 86 42 86 12 30 0
+=======
+TABLE test t1 46 28 18 28 4 14 0
+TABLE test t3 120 78 42 78 12 30 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 44 18 26 8 0 0 1 9 0 0 13
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 60 18 42 8 0 0 1 9 0 0 21
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 22 9 13 0 0 0 0 9 0 13
+TABLE test t3 30 9 21 0 0 0 0 9 0 21
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 97
TABLE test t2 0
TABLE test t3 188
connection default;
+=======
+TABLE test t1 68
+TABLE test t2 0
+TABLE test t3 150
+>>>>>>> merge-perfschema-5.7
flush tables;
"================== flush marker =================="
"================== Step 11 =================="
@@ -932,39 +1195,53 @@ 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 181
wait/lock/table/sql/handler 104
+=======
+wait/io/table/sql/handler 166
+wait/lock/table/sql/handler 52
+>>>>>>> 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 42 28 14 28 4 10 0
TABLE test t1 index_b 3 3 0 3 0 0 0
+=======
+TABLE test t1 NULL 28 24 4 24 4 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 8 4 4 4 0 4 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 110 68 42 68 12 30 0
-TABLE test t3 index_b 14 14 0 14 0 0 0
+TABLE test t1 PRIMARY 18 4 14 4 0 14 0
+TABLE test t3 NULL 76 64 12 64 12 0 0
+TABLE test t3 index_b 10 10 0 10 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 4 4 0 4 0 0 0
+TABLE test t3 PRIMARY 34 4 30 4 0 30 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 53 35 18 35 4 14 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 128 86 42 86 12 30 0
+=======
+TABLE test t1 46 28 18 28 4 14 0
+TABLE test t3 120 78 42 78 12 30 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 44 18 26 8 0 0 1 9 0 0 13
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 60 18 42 8 0 0 1 9 0 0 21
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 22 9 13 0 0 0 0 9 0 13
+TABLE test t3 30 9 21 0 0 0 0 9 0 21
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 97
+=======
+TABLE test t1 68
+>>>>>>> merge-perfschema-5.7
TABLE test t2 0
-TABLE test t3 188
+TABLE test t3 150
set global read_only=1;
set global read_only=0;
"================== global read_only marker =================="
@@ -1008,40 +1285,57 @@ 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 181
wait/lock/table/sql/handler 104
+=======
+wait/io/table/sql/handler 166
+wait/lock/table/sql/handler 52
+>>>>>>> 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 42 28 14 28 4 10 0
TABLE test t1 index_b 3 3 0 3 0 0 0
+=======
+TABLE test t1 NULL 28 24 4 24 4 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 8 4 4 4 0 4 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 110 68 42 68 12 30 0
-TABLE test t3 index_b 14 14 0 14 0 0 0
+TABLE test t1 PRIMARY 18 4 14 4 0 14 0
+TABLE test t3 NULL 76 64 12 64 12 0 0
+TABLE test t3 index_b 10 10 0 10 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 4 4 0 4 0 0 0
+TABLE test t3 PRIMARY 34 4 30 4 0 30 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 53 35 18 35 4 14 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 128 86 42 86 12 30 0
+=======
+TABLE test t1 46 28 18 28 4 14 0
+TABLE test t3 120 78 42 78 12 30 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 44 18 26 8 0 0 1 9 0 0 13
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 60 18 42 8 0 0 1 9 0 0 21
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 22 9 13 0 0 0 0 9 0 13
+TABLE test t3 30 9 21 0 0 0 0 9 0 21
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 97
TABLE test t2 0
TABLE test t3 188
disconnect con1;
+=======
+TABLE test t1 68
+TABLE test t2 0
+TABLE test t3 150
+"================== con1 disconnected =================="
+>>>>>>> merge-perfschema-5.7
"================== Step 13 =================="
call dump_thread();
username status
@@ -1081,40 +1375,57 @@ 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 181
wait/lock/table/sql/handler 104
+=======
+wait/io/table/sql/handler 166
+wait/lock/table/sql/handler 52
+>>>>>>> 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 42 28 14 28 4 10 0
TABLE test t1 index_b 3 3 0 3 0 0 0
+=======
+TABLE test t1 NULL 28 24 4 24 4 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 8 4 4 4 0 4 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 110 68 42 68 12 30 0
-TABLE test t3 index_b 14 14 0 14 0 0 0
+TABLE test t1 PRIMARY 18 4 14 4 0 14 0
+TABLE test t3 NULL 76 64 12 64 12 0 0
+TABLE test t3 index_b 10 10 0 10 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 4 4 0 4 0 0 0
+TABLE test t3 PRIMARY 34 4 30 4 0 30 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 53 35 18 35 4 14 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 128 86 42 86 12 30 0
+=======
+TABLE test t1 46 28 18 28 4 14 0
+TABLE test t3 120 78 42 78 12 30 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 44 18 26 8 0 0 1 9 0 0 13
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 60 18 42 8 0 0 1 9 0 0 21
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 22 9 13 0 0 0 0 9 0 13
+TABLE test t3 30 9 21 0 0 0 0 9 0 21
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 97
TABLE test t2 0
TABLE test t3 188
disconnect con2;
+=======
+TABLE test t1 68
+TABLE test t2 0
+TABLE test t3 150
+"================== con2 disconnected =================="
+>>>>>>> merge-perfschema-5.7
"================== Step 14 =================="
call dump_thread();
username status
@@ -1153,40 +1464,57 @@ 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 181
wait/lock/table/sql/handler 104
+=======
+wait/io/table/sql/handler 166
+wait/lock/table/sql/handler 52
+>>>>>>> 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 42 28 14 28 4 10 0
TABLE test t1 index_b 3 3 0 3 0 0 0
+=======
+TABLE test t1 NULL 28 24 4 24 4 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 8 4 4 4 0 4 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 110 68 42 68 12 30 0
-TABLE test t3 index_b 14 14 0 14 0 0 0
+TABLE test t1 PRIMARY 18 4 14 4 0 14 0
+TABLE test t3 NULL 76 64 12 64 12 0 0
+TABLE test t3 index_b 10 10 0 10 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 4 4 0 4 0 0 0
+TABLE test t3 PRIMARY 34 4 30 4 0 30 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 53 35 18 35 4 14 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 128 86 42 86 12 30 0
+=======
+TABLE test t1 46 28 18 28 4 14 0
+TABLE test t3 120 78 42 78 12 30 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 44 18 26 8 0 0 1 9 0 0 13
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 60 18 42 8 0 0 1 9 0 0 21
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 22 9 13 0 0 0 0 9 0 13
+TABLE test t3 30 9 21 0 0 0 0 9 0 21
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 97
TABLE test t2 0
TABLE test t3 188
disconnect con3;
+=======
+TABLE test t1 68
+TABLE test t2 0
+TABLE test t3 150
+"================== con3 disconnected =================="
+>>>>>>> merge-perfschema-5.7
"================== Step 15 =================="
call dump_thread();
username status
@@ -1224,40 +1552,57 @@ 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 181
wait/lock/table/sql/handler 104
+=======
+wait/io/table/sql/handler 166
+wait/lock/table/sql/handler 52
+>>>>>>> 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 42 28 14 28 4 10 0
TABLE test t1 index_b 3 3 0 3 0 0 0
+=======
+TABLE test t1 NULL 28 24 4 24 4 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 8 4 4 4 0 4 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 110 68 42 68 12 30 0
-TABLE test t3 index_b 14 14 0 14 0 0 0
+TABLE test t1 PRIMARY 18 4 14 4 0 14 0
+TABLE test t3 NULL 76 64 12 64 12 0 0
+TABLE test t3 index_b 10 10 0 10 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 4 4 0 4 0 0 0
+TABLE test t3 PRIMARY 34 4 30 4 0 30 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 53 35 18 35 4 14 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 128 86 42 86 12 30 0
+=======
+TABLE test t1 46 28 18 28 4 14 0
+TABLE test t3 120 78 42 78 12 30 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 44 18 26 8 0 0 1 9 0 0 13
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 60 18 42 8 0 0 1 9 0 0 21
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 22 9 13 0 0 0 0 9 0 13
+TABLE test t3 30 9 21 0 0 0 0 9 0 21
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 97
TABLE test t2 0
TABLE test t3 188
disconnect con4;
+=======
+TABLE test t1 68
+TABLE test t2 0
+TABLE test t3 150
+"================== con4 disconnected =================="
+>>>>>>> merge-perfschema-5.7
"================== Step 16 =================="
call dump_thread();
username status
@@ -1294,40 +1639,56 @@ 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 181
wait/lock/table/sql/handler 104
+=======
+wait/io/table/sql/handler 166
+wait/lock/table/sql/handler 52
+>>>>>>> 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 42 28 14 28 4 10 0
TABLE test t1 index_b 3 3 0 3 0 0 0
+=======
+TABLE test t1 NULL 28 24 4 24 4 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 8 4 4 4 0 4 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 110 68 42 68 12 30 0
-TABLE test t3 index_b 14 14 0 14 0 0 0
+TABLE test t1 PRIMARY 18 4 14 4 0 14 0
+TABLE test t3 NULL 76 64 12 64 12 0 0
+TABLE test t3 index_b 10 10 0 10 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 4 4 0 4 0 0 0
+TABLE test t3 PRIMARY 34 4 30 4 0 30 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 53 35 18 35 4 14 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 128 86 42 86 12 30 0
+=======
+TABLE test t1 46 28 18 28 4 14 0
+TABLE test t3 120 78 42 78 12 30 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 44 18 26 8 0 0 1 9 0 0 13
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 60 18 42 8 0 0 1 9 0 0 21
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 22 9 13 0 0 0 0 9 0 13
+TABLE test t3 30 9 21 0 0 0 0 9 0 21
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 97
TABLE test t2 0
TABLE test t3 188
connection default;
+=======
+TABLE test t1 68
+TABLE test t2 0
+TABLE test t3 150
+>>>>>>> merge-perfschema-5.7
truncate performance_schema.events_waits_summary_by_thread_by_event_name;
"================== BY_THREAD truncated =================="
"================== Step 17 =================="
@@ -1366,39 +1727,53 @@ 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 181
wait/lock/table/sql/handler 104
+=======
+wait/io/table/sql/handler 166
+wait/lock/table/sql/handler 52
+>>>>>>> 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 42 28 14 28 4 10 0
TABLE test t1 index_b 3 3 0 3 0 0 0
+=======
+TABLE test t1 NULL 28 24 4 24 4 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 8 4 4 4 0 4 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 110 68 42 68 12 30 0
-TABLE test t3 index_b 14 14 0 14 0 0 0
+TABLE test t1 PRIMARY 18 4 14 4 0 14 0
+TABLE test t3 NULL 76 64 12 64 12 0 0
+TABLE test t3 index_b 10 10 0 10 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 4 4 0 4 0 0 0
+TABLE test t3 PRIMARY 34 4 30 4 0 30 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 53 35 18 35 4 14 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 128 86 42 86 12 30 0
+=======
+TABLE test t1 46 28 18 28 4 14 0
+TABLE test t3 120 78 42 78 12 30 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 44 18 26 8 0 0 1 9 0 0 13
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 60 18 42 8 0 0 1 9 0 0 21
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 22 9 13 0 0 0 0 9 0 13
+TABLE test t3 30 9 21 0 0 0 0 9 0 21
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 97
+=======
+TABLE test t1 68
+>>>>>>> merge-perfschema-5.7
TABLE test t2 0
-TABLE test t3 188
+TABLE test t3 150
truncate performance_schema.events_waits_summary_by_account_by_event_name;
"================== BY_ACCOUNT truncated =================="
"================== Step 18 =================="
@@ -1437,39 +1812,53 @@ 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 181
wait/lock/table/sql/handler 104
+=======
+wait/io/table/sql/handler 166
+wait/lock/table/sql/handler 52
+>>>>>>> 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 42 28 14 28 4 10 0
TABLE test t1 index_b 3 3 0 3 0 0 0
+=======
+TABLE test t1 NULL 28 24 4 24 4 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 8 4 4 4 0 4 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 110 68 42 68 12 30 0
-TABLE test t3 index_b 14 14 0 14 0 0 0
+TABLE test t1 PRIMARY 18 4 14 4 0 14 0
+TABLE test t3 NULL 76 64 12 64 12 0 0
+TABLE test t3 index_b 10 10 0 10 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 4 4 0 4 0 0 0
+TABLE test t3 PRIMARY 34 4 30 4 0 30 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 53 35 18 35 4 14 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 128 86 42 86 12 30 0
+=======
+TABLE test t1 46 28 18 28 4 14 0
+TABLE test t3 120 78 42 78 12 30 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 44 18 26 8 0 0 1 9 0 0 13
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 60 18 42 8 0 0 1 9 0 0 21
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 22 9 13 0 0 0 0 9 0 13
+TABLE test t3 30 9 21 0 0 0 0 9 0 21
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 97
+=======
+TABLE test t1 68
+>>>>>>> merge-perfschema-5.7
TABLE test t2 0
-TABLE test t3 188
+TABLE test t3 150
truncate performance_schema.events_waits_summary_by_user_by_event_name;
"================== BY_USER truncated =================="
"================== Step 19 =================="
@@ -1508,39 +1897,53 @@ 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 181
wait/lock/table/sql/handler 104
+=======
+wait/io/table/sql/handler 166
+wait/lock/table/sql/handler 52
+>>>>>>> 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 42 28 14 28 4 10 0
TABLE test t1 index_b 3 3 0 3 0 0 0
+=======
+TABLE test t1 NULL 28 24 4 24 4 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 8 4 4 4 0 4 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 110 68 42 68 12 30 0
-TABLE test t3 index_b 14 14 0 14 0 0 0
+TABLE test t1 PRIMARY 18 4 14 4 0 14 0
+TABLE test t3 NULL 76 64 12 64 12 0 0
+TABLE test t3 index_b 10 10 0 10 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 4 4 0 4 0 0 0
+TABLE test t3 PRIMARY 34 4 30 4 0 30 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 53 35 18 35 4 14 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 128 86 42 86 12 30 0
+=======
+TABLE test t1 46 28 18 28 4 14 0
+TABLE test t3 120 78 42 78 12 30 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 44 18 26 8 0 0 1 9 0 0 13
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 60 18 42 8 0 0 1 9 0 0 21
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 22 9 13 0 0 0 0 9 0 13
+TABLE test t3 30 9 21 0 0 0 0 9 0 21
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 97
+=======
+TABLE test t1 68
+>>>>>>> merge-perfschema-5.7
TABLE test t2 0
-TABLE test t3 188
+TABLE test t3 150
truncate performance_schema.events_waits_summary_by_host_by_event_name;
"================== BY_HOST truncated =================="
"================== Step 21 =================="
@@ -1579,39 +1982,53 @@ 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 181
wait/lock/table/sql/handler 104
+=======
+wait/io/table/sql/handler 166
+wait/lock/table/sql/handler 52
+>>>>>>> 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 42 28 14 28 4 10 0
TABLE test t1 index_b 3 3 0 3 0 0 0
+=======
+TABLE test t1 NULL 28 24 4 24 4 0 0
+TABLE test t1 index_b 0 0 0 0 0 0 0
+>>>>>>> merge-perfschema-5.7
TABLE test t1 index_cb 0 0 0 0 0 0 0
-TABLE test t1 PRIMARY 8 4 4 4 0 4 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
-TABLE test t3 NULL 110 68 42 68 12 30 0
-TABLE test t3 index_b 14 14 0 14 0 0 0
+TABLE test t1 PRIMARY 18 4 14 4 0 14 0
+TABLE test t3 NULL 76 64 12 64 12 0 0
+TABLE test t3 index_b 10 10 0 10 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
-TABLE test t3 PRIMARY 4 4 0 4 0 0 0
+TABLE test t3 PRIMARY 34 4 30 4 0 30 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
+<<<<<<< HEAD
TABLE test t1 53 35 18 35 4 14 0
TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 128 86 42 86 12 30 0
+=======
+TABLE test t1 46 28 18 28 4 14 0
+TABLE test t3 120 78 42 78 12 30 0
+>>>>>>> merge-perfschema-5.7
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 44 18 26 8 0 0 1 9 0 0 13
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 60 18 42 8 0 0 1 9 0 0 21
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 22 9 13 0 0 0 0 9 0 13
+TABLE test t3 30 9 21 0 0 0 0 9 0 21
execute dump_objects_summary;
object_type object_schema object_name count_star
+<<<<<<< HEAD
TABLE test t1 97
+=======
+TABLE test t1 68
+>>>>>>> merge-perfschema-5.7
TABLE test t2 0
-TABLE test t3 188
+TABLE test t3 150
truncate performance_schema.events_waits_summary_global_by_event_name;
"================== GLOBAL truncated =================="
"================== Step 21 =================="
@@ -1660,10 +2077,6 @@ TABLE test t1 NULL 0 0 0 0 0 0 0
TABLE test t1 index_b 0 0 0 0 0 0 0
TABLE test t1 index_cb 0 0 0 0 0 0 0
TABLE test t1 PRIMARY 0 0 0 0 0 0 0
-TABLE test t2 NULL 0 0 0 0 0 0 0
-TABLE test t2 index_b 0 0 0 0 0 0 0
-TABLE test t2 index_cb 0 0 0 0 0 0 0
-TABLE test t2 PRIMARY 0 0 0 0 0 0 0
TABLE test t3 NULL 0 0 0 0 0 0 0
TABLE test t3 index_b 0 0 0 0 0 0 0
TABLE test t3 index_cb 0 0 0 0 0 0 0
@@ -1671,19 +2084,17 @@ TABLE test t3 PRIMARY 0 0 0 0 0 0 0
execute dump_waits_table_io;
object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete
TABLE test t1 0 0 0 0 0 0 0
-TABLE test t2 0 0 0 0 0 0 0
TABLE test t3 0 0 0 0 0 0 0
execute dump_waits_table_lock;
-object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_delayed count_write_low_priority count_write_external
-TABLE test t1 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t2 0 0 0 0 0 0 0 0 0 0 0
-TABLE test t3 0 0 0 0 0 0 0 0 0 0 0
+object_type object_schema object_name count_star count_read count_write count_read_normal count_read_with_shared_locks count_read_high_priority count_read_no_insert count_read_external count_write_low_priority count_write_external
+TABLE test t1 0 0 0 0 0 0 0 0 0 0
+TABLE test t3 0 0 0 0 0 0 0 0 0 0
execute dump_objects_summary;
object_type object_schema object_name count_star
TABLE test t1 0
TABLE test t2 0
TABLE test t3 0
-show status like "performance_schema%";
+show global status like "performance_schema%";
Variable_name Value
Performance_schema_accounts_lost 0
Performance_schema_cond_classes_lost 0
@@ -1693,9 +2104,15 @@ Performance_schema_file_classes_lost 0
Performance_schema_file_handles_lost 0
Performance_schema_file_instances_lost 0
Performance_schema_hosts_lost 0
+Performance_schema_index_stat_lost 0
Performance_schema_locker_lost 0
+Performance_schema_memory_classes_lost 0
+Performance_schema_metadata_lock_lost 0
Performance_schema_mutex_classes_lost 0
Performance_schema_mutex_instances_lost 0
+Performance_schema_nested_statement_lost 0
+Performance_schema_prepared_statements_lost 0
+Performance_schema_program_lost 0
Performance_schema_rwlock_classes_lost 0
Performance_schema_rwlock_instances_lost 0
Performance_schema_session_connect_attrs_lost 0
@@ -1705,6 +2122,7 @@ Performance_schema_stage_classes_lost 0
Performance_schema_statement_classes_lost 0
Performance_schema_table_handles_lost 0
Performance_schema_table_instances_lost 0
+Performance_schema_table_lock_stat_lost 0
Performance_schema_thread_classes_lost 0
Performance_schema_thread_instances_lost 0
Performance_schema_users_lost 0