diff options
Diffstat (limited to 'mysql-test/suite/perfschema')
246 files changed, 5716 insertions, 5599 deletions
diff --git a/mysql-test/suite/perfschema/disabled.def b/mysql-test/suite/perfschema/disabled.def new file mode 100644 index 00000000000..d9e9e5bf34e --- /dev/null +++ b/mysql-test/suite/perfschema/disabled.def @@ -0,0 +1,24 @@ +############################################################################## +# +# List the test cases that are to be disabled temporarily. +# +# Separate the test case name and the comment with ':'. +# +# <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment> +# +# Do not use any TAB characters for whitespace. +# +############################################################################## +sizing_off: not updated for 10.0 yet +sizing_med: not updated for 10.0 yet +sizing_low: not updated for 10.0 yet +sizing_high: not updated for 10.0 yet +sizing_growth: not updated for 10.0 yet +sizing_default: not updated for 10.0 yet + +binlog_edge_mix: needs slave_relay_log_info +binlog_edge_row: needs slave_relay_log_info +binlog_edge_stmt: needs slave_relay_log_info +binlog_ok_mix: needs slave_relay_log_info +binlog_ok_row: needs slave_relay_log_info +binlog_ok_stmt: needs slave_relay_log_info diff --git a/mysql-test/suite/perfschema/include/binlog_common.inc b/mysql-test/suite/perfschema/include/binlog_common.inc new file mode 100644 index 00000000000..1c8651a070c --- /dev/null +++ b/mysql-test/suite/perfschema/include/binlog_common.inc @@ -0,0 +1,41 @@ +# Tests for PERFORMANCE_SCHEMA + +RESET MASTER; + +select count(*) > 0 from performance_schema.setup_instruments; + +# Note: +# Do not include records that could depend on +# compiling options (storage engines, SSL), +# to ensure the expected output in the binlog is predictable. +update performance_schema.setup_instruments set enabled='NO' + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); + +select count(*) > 0 from performance_schema.events_waits_current; + +--disable_warnings +drop table if exists test.t1; +drop table if exists test.t2; +--enable_warnings + +create table test.t1 (thread_id integer); +create table test.t2 (name varchar(128)); + +insert into test.t1 + select thread_id from performance_schema.events_waits_current; + +insert into test.t2 + select name from performance_schema.setup_instruments + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); + +drop table test.t1; +drop table test.t2; + +update performance_schema.setup_instruments set enabled='YES' + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); + +--source include/show_binlog_events.inc + diff --git a/mysql-test/suite/perfschema/include/pfs_upgrade.inc b/mysql-test/suite/perfschema/include/pfs_upgrade.inc new file mode 100644 index 00000000000..0d4a864940c --- /dev/null +++ b/mysql-test/suite/perfschema/include/pfs_upgrade.inc @@ -0,0 +1,112 @@ +# Tests for PERFORMANCE_SCHEMA +# Make sure mysql_upgrade does not destroy data in a 'performance_schema' +# database. +# + +# Some initial settings + Preemptive cleanup +let $MYSQLD_DATADIR= `SELECT @@datadir`; +let $err_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade.err; +let $out_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade.out; +--error 0,1 +--remove_file $out_file +--error 0,1 +--remove_file $err_file + +--disable_warnings +drop table if exists test.user_table; +drop procedure if exists test.user_proc; +drop function if exists test.user_func; +drop event if exists test.user_event; +--enable_warnings + + +--echo "Testing mysql_upgrade with TABLE performance_schema.user_table" + +create table test.user_table(a int); + +--error 0,1 +--remove_file $MYSQLD_DATADIR/performance_schema/user_table.frm +--copy_file $MYSQLD_DATADIR/test/user_table.frm $MYSQLD_DATADIR/performance_schema/user_table.frm + +# Make sure the table is visible +use performance_schema; +show tables like "user_table"; + +--source suite/perfschema/include/upgrade_check.inc + +# Make sure the table is still visible +show tables like "user_table"; + +use test; + +--remove_file $MYSQLD_DATADIR/performance_schema/user_table.frm +drop table test.user_table; + + +--echo "Testing mysql_upgrade with VIEW performance_schema.user_view" + +create view test.user_view as select "Not supposed to be here"; + +--error 0,1 +--remove_file $MYSQLD_DATADIR/performance_schema/user_view.frm +--copy_file $MYSQLD_DATADIR/test/user_view.frm $MYSQLD_DATADIR/performance_schema/user_view.frm + +# Make sure the view is visible +use performance_schema; +show tables like "user_view"; + +--source suite/perfschema/include/upgrade_check.inc + +# Make sure the view is still visible +show tables like "user_view"; + +use test; + +--remove_file $MYSQLD_DATADIR/performance_schema/user_view.frm +drop view test.user_view; + + +--echo "Testing mysql_upgrade with PROCEDURE performance_schema.user_proc" + +create procedure test.user_proc() + select "Not supposed to be here"; + +update mysql.proc set db='performance_schema' where name='user_proc'; + +--source suite/perfschema/include/upgrade_check.inc + +select name from mysql.proc where db='performance_schema'; + +update mysql.proc set db='test' where name='user_proc'; +drop procedure test.user_proc; + + +--echo "Testing mysql_upgrade with FUNCTION performance_schema.user_func" + +create function test.user_func() returns integer + return 0; + +update mysql.proc set db='performance_schema' where name='user_func'; + +--source suite/perfschema/include/upgrade_check.inc + +select name from mysql.proc where db='performance_schema'; + +update mysql.proc set db='test' where name='user_func'; +drop function test.user_func; + + +--echo "Testing mysql_upgrade with EVENT performance_schema.user_event" + +create event test.user_event on schedule every 1 day do + select "not supposed to be here"; + +update mysql.event set db='performance_schema' where name='user_event'; + +--source suite/perfschema/include/upgrade_check.inc + +select name from mysql.event where db='performance_schema'; + +update mysql.event set db='test' where name='user_event'; +drop event test.user_event; + diff --git a/mysql-test/suite/perfschema/include/privilege.inc b/mysql-test/suite/perfschema/include/privilege.inc index 054b864befd..f01511b6fc8 100644 --- a/mysql-test/suite/perfschema/include/privilege.inc +++ b/mysql-test/suite/perfschema/include/privilege.inc @@ -85,16 +85,16 @@ create trigger performance_schema.bi_file_instances before insert on performance_schema.file_instances for each row begin end; ---error ER_WRONG_PERFSCHEMA_USAGE +--error ER_CANT_CREATE_TABLE create table test.t1(a int) engine=PERFORMANCE_SCHEMA; ---error ER_WRONG_PERFSCHEMA_USAGE +--error ER_CANT_CREATE_TABLE create table test.t1 like performance_schema.setup_instruments; ---error ER_WRONG_PERFSCHEMA_USAGE +--error ER_CANT_CREATE_TABLE create table test.t1 like performance_schema.events_waits_current; ---error ER_WRONG_PERFSCHEMA_USAGE +--error ER_CANT_CREATE_TABLE create table test.t1 like performance_schema.file_instances; --error ER_TABLEACCESS_DENIED_ERROR diff --git a/mysql-test/suite/perfschema/include/upgrade_check.inc b/mysql-test/suite/perfschema/include/upgrade_check.inc index 440eb8f7123..52d4cfd1e63 100644 --- a/mysql-test/suite/perfschema/include/upgrade_check.inc +++ b/mysql-test/suite/perfschema/include/upgrade_check.inc @@ -8,6 +8,8 @@ --source include/wait_until_count_sessions.inc # Verify that mysql_upgrade complained about the performance_schema + +--replace_regex /at line [0-9]+/at line ###/ --cat_file $err_file --error 0,1 --remove_file $out_file diff --git a/mysql-test/suite/perfschema/r/binlog_mix.result b/mysql-test/suite/perfschema/r/binlog_mix.result new file mode 100644 index 00000000000..f5964db4c28 --- /dev/null +++ b/mysql-test/suite/perfschema/r/binlog_mix.result @@ -0,0 +1,48 @@ +set binlog_format=mixed; +RESET MASTER; +select count(*) > 0 from performance_schema.setup_instruments; +count(*) > 0 +1 +update performance_schema.setup_instruments set enabled='NO' + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); +select count(*) > 0 from performance_schema.events_waits_current; +count(*) > 0 +1 +drop table if exists test.t1; +drop table if exists test.t2; +create table test.t1 (thread_id integer); +create table test.t2 (name varchar(128)); +insert into test.t1 +select thread_id from performance_schema.events_waits_current; +insert into test.t2 +select name from performance_schema.setup_instruments +where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); +drop table test.t1; +drop table test.t2; +update performance_schema.setup_instruments set enabled='YES' + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); +include/show_binlog_events.inc +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */ +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t2` /* generated by server */ +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; create table test.t1 (thread_id integer) +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; create table test.t2 (name varchar(128)) +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Table_map # # table_id: # (test.t1) +master-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F +master-bin.000001 # Query # # COMMIT +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Table_map # # table_id: # (test.t2) +master-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F +master-bin.000001 # Query # # COMMIT +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ diff --git a/mysql-test/suite/perfschema/r/binlog_row.result b/mysql-test/suite/perfschema/r/binlog_row.result new file mode 100644 index 00000000000..629421abd83 --- /dev/null +++ b/mysql-test/suite/perfschema/r/binlog_row.result @@ -0,0 +1,48 @@ +set binlog_format=row; +RESET MASTER; +select count(*) > 0 from performance_schema.setup_instruments; +count(*) > 0 +1 +update performance_schema.setup_instruments set enabled='NO' + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); +select count(*) > 0 from performance_schema.events_waits_current; +count(*) > 0 +1 +drop table if exists test.t1; +drop table if exists test.t2; +create table test.t1 (thread_id integer); +create table test.t2 (name varchar(128)); +insert into test.t1 +select thread_id from performance_schema.events_waits_current; +insert into test.t2 +select name from performance_schema.setup_instruments +where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); +drop table test.t1; +drop table test.t2; +update performance_schema.setup_instruments set enabled='YES' + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); +include/show_binlog_events.inc +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */ +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t2` /* generated by server */ +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; create table test.t1 (thread_id integer) +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; create table test.t2 (name varchar(128)) +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Table_map # # table_id: # (test.t1) +master-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F +master-bin.000001 # Query # # COMMIT +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Table_map # # table_id: # (test.t2) +master-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F +master-bin.000001 # Query # # COMMIT +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ diff --git a/mysql-test/suite/perfschema/r/binlog_stmt.result b/mysql-test/suite/perfschema/r/binlog_stmt.result new file mode 100644 index 00000000000..b2993e454da --- /dev/null +++ b/mysql-test/suite/perfschema/r/binlog_stmt.result @@ -0,0 +1,55 @@ +set binlog_format=statement; +call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); +RESET MASTER; +select count(*) > 0 from performance_schema.setup_instruments; +count(*) > 0 +1 +update performance_schema.setup_instruments set enabled='NO' + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); +select count(*) > 0 from performance_schema.events_waits_current; +count(*) > 0 +1 +drop table if exists test.t1; +drop table if exists test.t2; +create table test.t1 (thread_id integer); +create table test.t2 (name varchar(128)); +insert into test.t1 +select thread_id from performance_schema.events_waits_current; +Warnings: +Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves. +insert into test.t2 +select name from performance_schema.setup_instruments +where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); +Warnings: +Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves. +drop table test.t1; +drop table test.t2; +update performance_schema.setup_instruments set enabled='YES' + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); +include/show_binlog_events.inc +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */ +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t2` /* generated by server */ +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; create table test.t1 (thread_id integer) +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; create table test.t2 (name varchar(128)) +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Query # # use `test`; insert into test.t1 +select thread_id from performance_schema.events_waits_current +master-bin.000001 # Query # # COMMIT +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Query # # use `test`; insert into test.t2 +select name from performance_schema.setup_instruments +where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock") +master-bin.000001 # Query # # COMMIT +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ diff --git a/mysql-test/suite/perfschema/r/column_privilege.result b/mysql-test/suite/perfschema/r/column_privilege.result index b013ea3fcad..e4ad9200272 100644 --- a/mysql-test/suite/perfschema/r/column_privilege.result +++ b/mysql-test/suite/perfschema/r/column_privilege.result @@ -1,7 +1,7 @@ show grants; Grants for root@localhost GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION -GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION +GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION grant usage on *.* to 'pfs_user_5'@localhost with GRANT OPTION; grant SELECT(thread_id, event_id) on performance_schema.events_waits_current to 'pfs_user_5'@localhost; diff --git a/mysql-test/suite/perfschema/r/connect_attrs.result b/mysql-test/suite/perfschema/r/connect_attrs.result index 0a9fddbbdb0..0fb0ad34ab2 100644 --- a/mysql-test/suite/perfschema/r/connect_attrs.result +++ b/mysql-test/suite/perfschema/r/connect_attrs.result @@ -41,4 +41,12 @@ ERROR 42000: SELECT command denied to user 'wl5924'@'localhost' for table 'sessi SELECT COUNT(DISTINCT PROCESSLIST_ID) FROM performance_schema.session_connect_attrs; ERROR 42000: SELECT command denied to user 'wl5924'@'localhost' for table 'session_connect_attrs' +grant select on performance_schema.* to wl5924@localhost; +SELECT SUM(ISNULL(ATTR_VALUE)), COUNT(*) +FROM performance_schema.session_account_connect_attrs +WHERE ATTR_NAME IN ('_os', '_client_name', '_pid', +'_client_version', '_platform', 'program_name') +AND PROCESSLIST_ID = CONNECTION_ID(); +SUM(ISNULL(ATTR_VALUE)) COUNT(*) +0 6 DROP USER wl5924@localhost; diff --git a/mysql-test/suite/perfschema/r/digest_table_full.result b/mysql-test/suite/perfschema/r/digest_table_full.result index 1d1fe10e73e..9c0efb7b1ca 100644 --- a/mysql-test/suite/perfschema/r/digest_table_full.result +++ b/mysql-test/suite/perfschema/r/digest_table_full.result @@ -113,7 +113,7 @@ SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARN SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS NULL NULL NULL 55 32 1 2 -statements_digest e4a84a547a18a89f4708509a720def58 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 +statements_digest 0e98ee6a98e296530ec59c12dbc08dfe TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 SHOW VARIABLES LIKE "performance_schema_digests_size"; Variable_name Value performance_schema_digests_size 2 diff --git a/mysql-test/suite/perfschema/r/dml_handler.result b/mysql-test/suite/perfschema/r/dml_handler.result index ef1292a33cc..2a1cc7035af 100644 --- a/mysql-test/suite/perfschema/r/dml_handler.result +++ b/mysql-test/suite/perfschema/r/dml_handler.result @@ -11,158 +11,158 @@ SELECT COUNT(*) FROM table_list INTO @table_count; SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=52; HANDLER performance_schema.users OPEN; -ERROR HY000: Table storage engine for 'users' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`users` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=51; HANDLER performance_schema.threads OPEN; -ERROR HY000: Table storage engine for 'threads' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`threads` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=50; HANDLER performance_schema.table_lock_waits_summary_by_table OPEN; -ERROR HY000: Table storage engine for 'table_lock_waits_summary_by_table' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_lock_waits_summary_by_table` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=49; HANDLER performance_schema.table_io_waits_summary_by_table OPEN; -ERROR HY000: Table storage engine for 'table_io_waits_summary_by_table' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_io_waits_summary_by_table` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=48; HANDLER performance_schema.table_io_waits_summary_by_index_usage OPEN; -ERROR HY000: Table storage engine for 'table_io_waits_summary_by_index_usage' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_io_waits_summary_by_index_usage` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=47; HANDLER performance_schema.socket_summary_by_instance OPEN; -ERROR HY000: Table storage engine for 'socket_summary_by_instance' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_summary_by_instance` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=46; HANDLER performance_schema.socket_summary_by_event_name OPEN; -ERROR HY000: Table storage engine for 'socket_summary_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_summary_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=45; HANDLER performance_schema.socket_instances OPEN; -ERROR HY000: Table storage engine for 'socket_instances' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_instances` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=44; HANDLER performance_schema.setup_timers OPEN; -ERROR HY000: Table storage engine for 'setup_timers' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_timers` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=43; HANDLER performance_schema.setup_objects OPEN; -ERROR HY000: Table storage engine for 'setup_objects' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_objects` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=42; HANDLER performance_schema.setup_instruments OPEN; -ERROR HY000: Table storage engine for 'setup_instruments' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_instruments` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=41; HANDLER performance_schema.setup_consumers OPEN; -ERROR HY000: Table storage engine for 'setup_consumers' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_consumers` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=40; HANDLER performance_schema.setup_actors OPEN; -ERROR HY000: Table storage engine for 'setup_actors' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_actors` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=39; HANDLER performance_schema.session_connect_attrs OPEN; -ERROR HY000: Table storage engine for 'session_connect_attrs' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`session_connect_attrs` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=38; HANDLER performance_schema.session_account_connect_attrs OPEN; -ERROR HY000: Table storage engine for 'session_account_connect_attrs' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`session_account_connect_attrs` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=37; HANDLER performance_schema.rwlock_instances OPEN; -ERROR HY000: Table storage engine for 'rwlock_instances' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`rwlock_instances` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=36; HANDLER performance_schema.performance_timers OPEN; -ERROR HY000: Table storage engine for 'performance_timers' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`performance_timers` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=35; HANDLER performance_schema.objects_summary_global_by_type OPEN; -ERROR HY000: Table storage engine for 'objects_summary_global_by_type' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`objects_summary_global_by_type` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=34; HANDLER performance_schema.mutex_instances OPEN; -ERROR HY000: Table storage engine for 'mutex_instances' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`mutex_instances` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=33; HANDLER performance_schema.hosts OPEN; -ERROR HY000: Table storage engine for 'hosts' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`hosts` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=32; HANDLER performance_schema.host_cache OPEN; -ERROR HY000: Table storage engine for 'host_cache' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`host_cache` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=31; HANDLER performance_schema.file_summary_by_instance OPEN; -ERROR HY000: Table storage engine for 'file_summary_by_instance' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_summary_by_instance` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=30; HANDLER performance_schema.file_summary_by_event_name OPEN; -ERROR HY000: Table storage engine for 'file_summary_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_summary_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=29; HANDLER performance_schema.file_instances OPEN; -ERROR HY000: Table storage engine for 'file_instances' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_instances` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=28; HANDLER performance_schema.events_waits_summary_global_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_waits_summary_global_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_global_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=27; HANDLER performance_schema.events_waits_summary_by_user_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_waits_summary_by_user_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_user_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=26; HANDLER performance_schema.events_waits_summary_by_thread_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_waits_summary_by_thread_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_thread_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=25; HANDLER performance_schema.events_waits_summary_by_instance OPEN; -ERROR HY000: Table storage engine for 'events_waits_summary_by_instance' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_instance` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=24; HANDLER performance_schema.events_waits_summary_by_host_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_waits_summary_by_host_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_host_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=23; HANDLER performance_schema.events_waits_summary_by_account_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_waits_summary_by_account_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_account_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=22; HANDLER performance_schema.events_waits_history_long OPEN; -ERROR HY000: Table storage engine for 'events_waits_history_long' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_history_long` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=21; HANDLER performance_schema.events_waits_history OPEN; -ERROR HY000: Table storage engine for 'events_waits_history' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_history` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=20; HANDLER performance_schema.events_waits_current OPEN; -ERROR HY000: Table storage engine for 'events_waits_current' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_current` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=19; HANDLER performance_schema.events_statements_summary_global_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_statements_summary_global_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_global_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=18; HANDLER performance_schema.events_statements_summary_by_user_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_statements_summary_by_user_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_user_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=17; HANDLER performance_schema.events_statements_summary_by_thread_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_statements_summary_by_thread_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_thread_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=16; HANDLER performance_schema.events_statements_summary_by_host_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_statements_summary_by_host_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_host_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=15; HANDLER performance_schema.events_statements_summary_by_digest OPEN; -ERROR HY000: Table storage engine for 'events_statements_summary_by_digest' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_digest` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=14; HANDLER performance_schema.events_statements_summary_by_account_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_statements_summary_by_account_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_account_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=13; HANDLER performance_schema.events_statements_history_long OPEN; -ERROR HY000: Table storage engine for 'events_statements_history_long' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_history_long` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=12; HANDLER performance_schema.events_statements_history OPEN; -ERROR HY000: Table storage engine for 'events_statements_history' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_history` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=11; HANDLER performance_schema.events_statements_current OPEN; -ERROR HY000: Table storage engine for 'events_statements_current' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_current` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=10; HANDLER performance_schema.events_stages_summary_global_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_stages_summary_global_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_summary_global_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=9; HANDLER performance_schema.events_stages_summary_by_user_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_stages_summary_by_user_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_summary_by_user_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=8; HANDLER performance_schema.events_stages_summary_by_thread_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_stages_summary_by_thread_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_summary_by_thread_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=7; HANDLER performance_schema.events_stages_summary_by_host_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_stages_summary_by_host_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_summary_by_host_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=6; HANDLER performance_schema.events_stages_summary_by_account_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_stages_summary_by_account_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_summary_by_account_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=5; HANDLER performance_schema.events_stages_history_long OPEN; -ERROR HY000: Table storage engine for 'events_stages_history_long' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_history_long` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=4; HANDLER performance_schema.events_stages_history OPEN; -ERROR HY000: Table storage engine for 'events_stages_history' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_history` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=3; HANDLER performance_schema.events_stages_current OPEN; -ERROR HY000: Table storage engine for 'events_stages_current' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_current` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=2; HANDLER performance_schema.cond_instances OPEN; -ERROR HY000: Table storage engine for 'cond_instances' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`cond_instances` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=1; HANDLER performance_schema.accounts OPEN; -ERROR HY000: Table storage engine for 'accounts' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`accounts` doesn't have this option DROP TEMPORARY TABLE table_list; diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result index b3de51ee007..b264a075eba 100644 --- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result +++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result @@ -7,28 +7,28 @@ NAME ENABLED TIMED wait/synch/mutex/sql/Cversion_lock YES YES wait/synch/mutex/sql/Delayed_insert::mutex YES YES wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state YES YES -wait/synch/mutex/sql/Gtid_state YES YES +wait/synch/mutex/sql/gtid_waiting::LOCK_gtid_waiting YES YES wait/synch/mutex/sql/hash_filo::lock YES YES +wait/synch/mutex/sql/HA_DATA_PARTITION::LOCK_auto_inc YES YES wait/synch/mutex/sql/LOCK_active_mi YES YES wait/synch/mutex/sql/LOCK_audit_mask YES YES -wait/synch/mutex/sql/LOCK_connection_count YES YES -wait/synch/mutex/sql/LOCK_crypt YES YES -wait/synch/mutex/sql/LOCK_delayed_create YES YES +wait/synch/mutex/sql/LOCK_binlog_state YES YES +wait/synch/mutex/sql/LOCK_commit_ordered YES YES select * from performance_schema.setup_instruments where name like 'Wait/Synch/Rwlock/sql/%' and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock') order by name limit 10; NAME ENABLED TIMED -wait/synch/rwlock/sql/Binlog_relay_IO_delegate::lock YES YES -wait/synch/rwlock/sql/Binlog_storage_delegate::lock YES YES -wait/synch/rwlock/sql/Binlog_transmit_delegate::lock YES YES -wait/synch/rwlock/sql/gtid_commit_rollback YES YES wait/synch/rwlock/sql/LOCK_dboptions YES YES wait/synch/rwlock/sql/LOCK_grant YES YES wait/synch/rwlock/sql/LOCK_system_variables_hash YES YES wait/synch/rwlock/sql/LOCK_sys_init_connect YES YES wait/synch/rwlock/sql/LOCK_sys_init_slave YES YES +wait/synch/rwlock/sql/LOCK_tdc YES YES wait/synch/rwlock/sql/LOGGER::LOCK_logger YES YES +wait/synch/rwlock/sql/MDL_context::LOCK_waiting_for YES YES +wait/synch/rwlock/sql/MDL_lock::rwlock YES YES +wait/synch/rwlock/sql/Query_cache_query::lock YES YES select * from performance_schema.setup_instruments where name like 'Wait/Synch/Cond/sql/%' and name not in ( @@ -37,15 +37,15 @@ where name like 'Wait/Synch/Cond/sql/%' order by name limit 10; NAME ENABLED TIMED wait/synch/cond/sql/COND_flush_thread_cache YES YES +wait/synch/cond/sql/COND_group_commit_orderer YES YES +wait/synch/cond/sql/COND_gtid_ignore_duplicates YES YES wait/synch/cond/sql/COND_manager YES YES +wait/synch/cond/sql/COND_parallel_entry YES YES +wait/synch/cond/sql/COND_prepare_ordered YES YES wait/synch/cond/sql/COND_queue_state YES YES -wait/synch/cond/sql/COND_server_started YES YES -wait/synch/cond/sql/COND_thread_cache YES YES -wait/synch/cond/sql/COND_thread_count YES YES -wait/synch/cond/sql/Delayed_insert::cond YES YES -wait/synch/cond/sql/Delayed_insert::cond_client YES YES -wait/synch/cond/sql/Event_scheduler::COND_state YES YES -wait/synch/cond/sql/Gtid_state YES YES +wait/synch/cond/sql/COND_rpl_thread YES YES +wait/synch/cond/sql/COND_rpl_thread_pool YES YES +wait/synch/cond/sql/COND_rpl_thread_queue YES YES select * from performance_schema.setup_instruments where name='Wait'; select * from performance_schema.setup_instruments diff --git a/mysql-test/suite/perfschema/r/event_aggregate.result b/mysql-test/suite/perfschema/r/event_aggregate.result index 6863ac6e2ce..a5cfe97f98e 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate.result +++ b/mysql-test/suite/perfschema/r/event_aggregate.result @@ -188,8 +188,8 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username status user2 not found username status @@ -200,31 +200,30 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 2 -localhost wait/synch/rwlock/sql/LOCK_grant 2 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 4 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 4 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -300,8 +299,8 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 1 user2 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -315,8 +314,8 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 1 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 @@ -325,8 +324,8 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 1 user2 wait/synch/mutex/sql/LOCK_connection_count 0 user2 wait/synch/mutex/sql/LOCK_user_locks 0 @@ -335,19 +334,18 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 5 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 2 -localhost wait/synch/rwlock/sql/LOCK_grant 2 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 5 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 5 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -448,13 +446,13 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username status user3 not found username status @@ -463,39 +461,38 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 8 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 4 -localhost wait/synch/rwlock/sql/LOCK_grant 4 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 8 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 8 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -589,13 +586,13 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 1 user3 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -607,12 +604,12 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 1 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 @@ -621,12 +618,12 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 1 user3 wait/synch/mutex/sql/LOCK_connection_count 0 user3 wait/synch/mutex/sql/LOCK_user_locks 0 @@ -635,19 +632,18 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 9 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 4 -localhost wait/synch/rwlock/sql/LOCK_grant 4 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 9 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 9 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -766,65 +762,64 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username status user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 12 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 6 -localhost wait/synch/rwlock/sql/LOCK_grant 6 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 12 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 12 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -936,18 +931,18 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 1 user4 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -957,16 +952,16 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 1 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 @@ -975,16 +970,16 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 1 user4 wait/synch/mutex/sql/LOCK_connection_count 0 user4 wait/synch/mutex/sql/LOCK_user_locks 0 @@ -993,19 +988,18 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 13 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 6 -localhost wait/synch/rwlock/sql/LOCK_grant 6 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 13 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 13 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1142,76 +1136,75 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 4 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 16 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 16 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 16 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1343,72 +1336,71 @@ user1 not found username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 4 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 17 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 17 wait/synch/mutex/sql/LOCK_connection_count 1 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 17 wait/synch/mutex/sql/LOCK_connection_count 1 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1543,67 +1535,66 @@ user2 not found username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 5 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 4 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 18 localhost wait/synch/mutex/sql/LOCK_connection_count 2 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 18 wait/synch/mutex/sql/LOCK_connection_count 2 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 18 wait/synch/mutex/sql/LOCK_connection_count 2 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1740,62 +1731,61 @@ user3 not found username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 5 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 5 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 4 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 5 user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 19 localhost wait/synch/mutex/sql/LOCK_connection_count 3 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 19 wait/synch/mutex/sql/LOCK_connection_count 3 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 19 wait/synch/mutex/sql/LOCK_connection_count 3 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1935,56 +1925,55 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 5 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 5 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 5 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 5 user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 5 user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 20 localhost wait/synch/mutex/sql/LOCK_connection_count 4 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -2125,56 +2114,55 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 5 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 5 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 5 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 5 user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 5 user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 20 localhost wait/synch/mutex/sql/LOCK_connection_count 4 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -2333,38 +2321,37 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 5 user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 5 user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 20 localhost wait/synch/mutex/sql/LOCK_connection_count 4 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -2541,20 +2528,19 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 20 localhost wait/synch/mutex/sql/LOCK_connection_count 4 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -2737,14 +2723,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -2933,8 +2918,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -3123,8 +3107,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -3313,8 +3296,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3503,8 +3485,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3693,8 +3674,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3883,8 +3863,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -4073,8 +4052,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -4263,8 +4241,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -4453,8 +4430,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -4643,8 +4619,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -4833,8 +4808,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -5007,8 +4981,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -5129,8 +5102,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -5215,8 +5187,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result index ad2440bd2d1..42945079ef4 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result @@ -173,8 +173,8 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username status user2 not found username status @@ -187,25 +187,24 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 2 -localhost wait/synch/rwlock/sql/LOCK_grant 2 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 4 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 4 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -271,8 +270,8 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 1 user2 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -288,8 +287,8 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 1 user2 wait/synch/mutex/sql/LOCK_connection_count 0 user2 wait/synch/mutex/sql/LOCK_user_locks 0 @@ -298,19 +297,18 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 5 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 2 -localhost wait/synch/rwlock/sql/LOCK_grant 2 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 5 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 5 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -392,13 +390,13 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username status user3 not found username status @@ -409,29 +407,28 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 8 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 4 -localhost wait/synch/rwlock/sql/LOCK_grant 4 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 8 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 8 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -506,13 +503,13 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 1 user3 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -526,12 +523,12 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 1 user3 wait/synch/mutex/sql/LOCK_connection_count 0 user3 wait/synch/mutex/sql/LOCK_user_locks 0 @@ -540,19 +537,18 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 9 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 4 -localhost wait/synch/rwlock/sql/LOCK_grant 4 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 9 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 9 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -643,18 +639,18 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username status user4 not found execute dump_waits_account; @@ -663,33 +659,32 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 12 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 6 -localhost wait/synch/rwlock/sql/LOCK_grant 6 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 12 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 12 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -773,18 +768,18 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 1 user4 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -796,16 +791,16 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 1 user4 wait/synch/mutex/sql/LOCK_connection_count 0 user4 wait/synch/mutex/sql/LOCK_user_locks 0 @@ -814,19 +809,18 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 13 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 6 -localhost wait/synch/rwlock/sql/LOCK_grant 6 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 13 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 13 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -926,60 +920,59 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 16 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 16 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 16 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1074,56 +1067,55 @@ user1 not found username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 17 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 17 wait/synch/mutex/sql/LOCK_connection_count 1 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 17 wait/synch/mutex/sql/LOCK_connection_count 1 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1221,51 +1213,50 @@ user2 not found username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 18 localhost wait/synch/mutex/sql/LOCK_connection_count 2 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 18 wait/synch/mutex/sql/LOCK_connection_count 2 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 18 wait/synch/mutex/sql/LOCK_connection_count 2 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1365,46 +1356,45 @@ user3 not found username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 5 user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 19 localhost wait/synch/mutex/sql/LOCK_connection_count 3 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 19 wait/synch/mutex/sql/LOCK_connection_count 3 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 19 wait/synch/mutex/sql/LOCK_connection_count 3 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1509,38 +1499,37 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 5 user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 5 user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 20 localhost wait/synch/mutex/sql/LOCK_connection_count 4 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1646,38 +1635,37 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 5 user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 5 user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 20 localhost wait/synch/mutex/sql/LOCK_connection_count 4 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1783,38 +1771,37 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 5 user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 5 user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 20 localhost wait/synch/mutex/sql/LOCK_connection_count 4 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1938,20 +1925,19 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 20 localhost wait/synch/mutex/sql/LOCK_connection_count 4 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2081,14 +2067,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2224,8 +2209,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2361,8 +2345,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2498,8 +2481,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2635,8 +2617,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2772,8 +2753,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2909,8 +2889,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3046,8 +3025,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3183,8 +3161,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3320,8 +3297,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3457,8 +3433,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3594,8 +3569,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3731,8 +3705,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3852,8 +3825,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3937,8 +3909,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result index 6faff1992c7..12893a8cc2b 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result @@ -147,8 +147,8 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username status user2 not found username status @@ -161,21 +161,20 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 4 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 4 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -232,8 +231,8 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 1 user2 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -249,8 +248,8 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 1 user2 wait/synch/mutex/sql/LOCK_connection_count 0 user2 wait/synch/mutex/sql/LOCK_user_locks 0 @@ -261,13 +260,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 5 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 5 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -340,13 +338,13 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username status user3 not found username status @@ -357,25 +355,24 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 8 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 8 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -441,13 +438,13 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 1 user3 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -461,12 +458,12 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 1 user3 wait/synch/mutex/sql/LOCK_connection_count 0 user3 wait/synch/mutex/sql/LOCK_user_locks 0 @@ -477,13 +474,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 9 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 9 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -565,18 +561,18 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username status user4 not found execute dump_waits_account; @@ -585,29 +581,28 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 12 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 12 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -682,18 +677,18 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 1 user4 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -705,16 +700,16 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 1 user4 wait/synch/mutex/sql/LOCK_connection_count 0 user4 wait/synch/mutex/sql/LOCK_user_locks 0 @@ -725,13 +720,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 13 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 13 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -822,56 +816,55 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 16 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 16 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -957,52 +950,51 @@ user1 not found username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 17 wait/synch/mutex/sql/LOCK_connection_count 1 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 17 wait/synch/mutex/sql/LOCK_connection_count 1 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1091,47 +1083,46 @@ user2 not found username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 18 wait/synch/mutex/sql/LOCK_connection_count 2 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 18 wait/synch/mutex/sql/LOCK_connection_count 2 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1222,42 +1213,41 @@ user3 not found username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 5 user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 19 wait/synch/mutex/sql/LOCK_connection_count 3 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 19 wait/synch/mutex/sql/LOCK_connection_count 3 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1353,34 +1343,33 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 5 user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 5 user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1477,34 +1466,33 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 5 user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 5 user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1601,34 +1589,33 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 5 user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 5 user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1745,14 +1732,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1869,14 +1855,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1999,8 +1984,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2123,8 +2107,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2247,8 +2230,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2371,8 +2353,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2495,8 +2476,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2619,8 +2599,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2743,8 +2722,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2867,8 +2845,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2991,8 +2968,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3115,8 +3091,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3239,8 +3214,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3363,8 +3337,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3471,8 +3444,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3543,8 +3515,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result index 87b81a54b6b..bd9a52361a1 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result @@ -158,8 +158,8 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username status user2 not found username status @@ -174,19 +174,18 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 2 -localhost wait/synch/rwlock/sql/LOCK_grant 2 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 4 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 4 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -242,8 +241,8 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 1 user2 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -261,19 +260,18 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 5 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 2 -localhost wait/synch/rwlock/sql/LOCK_grant 2 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 5 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 5 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -336,13 +334,13 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username status user3 not found username status @@ -355,19 +353,18 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 8 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 4 -localhost wait/synch/rwlock/sql/LOCK_grant 4 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 8 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 8 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -423,13 +420,13 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 1 user3 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -445,19 +442,18 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 9 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 4 -localhost wait/synch/rwlock/sql/LOCK_grant 4 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 9 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 9 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -520,18 +516,18 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username status user4 not found execute dump_waits_account; @@ -542,19 +538,18 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 12 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 6 -localhost wait/synch/rwlock/sql/LOCK_grant 6 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 12 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 12 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -610,18 +605,18 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 1 user4 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -635,19 +630,18 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 13 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 6 -localhost wait/synch/rwlock/sql/LOCK_grant 6 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 13 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 13 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -710,23 +704,23 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star execute dump_waits_user; @@ -735,19 +729,18 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 16 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 16 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 16 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -805,18 +798,18 @@ user1 not found username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star execute dump_waits_user; @@ -825,20 +818,19 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 17 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 17 wait/synch/mutex/sql/LOCK_connection_count 1 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 17 wait/synch/mutex/sql/LOCK_connection_count 1 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -899,13 +891,13 @@ user2 not found username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star execute dump_waits_user; @@ -914,20 +906,19 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 18 localhost wait/synch/mutex/sql/LOCK_connection_count 2 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 18 wait/synch/mutex/sql/LOCK_connection_count 2 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 18 wait/synch/mutex/sql/LOCK_connection_count 2 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -990,8 +981,8 @@ user3 not found username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star execute dump_waits_user; @@ -1000,20 +991,19 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 19 localhost wait/synch/mutex/sql/LOCK_connection_count 3 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 19 wait/synch/mutex/sql/LOCK_connection_count 3 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 19 wait/synch/mutex/sql/LOCK_connection_count 3 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1083,20 +1073,19 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 20 localhost wait/synch/mutex/sql/LOCK_connection_count 4 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1167,20 +1156,19 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 20 localhost wait/synch/mutex/sql/LOCK_connection_count 4 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1251,20 +1239,19 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 20 localhost wait/synch/mutex/sql/LOCK_connection_count 4 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1335,20 +1322,19 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 20 localhost wait/synch/mutex/sql/LOCK_connection_count 4 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1425,14 +1411,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1515,8 +1500,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1599,8 +1583,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1683,8 +1666,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1767,8 +1749,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1851,8 +1832,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1935,8 +1915,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2019,8 +1998,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2103,8 +2081,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2187,8 +2164,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2271,8 +2247,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2355,8 +2330,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2439,8 +2413,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2523,8 +2496,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2607,8 +2579,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result index 09144e3641b..bb14b14e291 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result @@ -132,8 +132,8 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username status user2 not found username status @@ -150,13 +150,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 4 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 4 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -203,8 +202,8 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 1 user2 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -224,13 +223,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 5 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 5 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -284,13 +282,13 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username status user3 not found username status @@ -305,13 +303,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 8 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 8 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -358,13 +355,13 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 1 user3 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -382,13 +379,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 9 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 9 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -442,18 +438,18 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username status user4 not found execute dump_waits_account; @@ -466,13 +462,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 12 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 12 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -519,18 +514,18 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 1 user4 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -546,13 +541,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 13 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 13 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -606,23 +600,23 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star execute dump_waits_user; @@ -633,13 +627,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 16 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 16 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -688,18 +681,18 @@ user1 not found username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star execute dump_waits_user; @@ -710,14 +703,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 17 wait/synch/mutex/sql/LOCK_connection_count 1 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 17 wait/synch/mutex/sql/LOCK_connection_count 1 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -769,13 +761,13 @@ user2 not found username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star execute dump_waits_user; @@ -786,14 +778,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 18 wait/synch/mutex/sql/LOCK_connection_count 2 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 18 wait/synch/mutex/sql/LOCK_connection_count 2 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -847,8 +838,8 @@ user3 not found username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star execute dump_waits_user; @@ -859,14 +850,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 19 wait/synch/mutex/sql/LOCK_connection_count 3 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 19 wait/synch/mutex/sql/LOCK_connection_count 3 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -929,14 +919,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1000,14 +989,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1071,14 +1059,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1142,14 +1129,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1213,14 +1199,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1290,8 +1275,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1361,8 +1345,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1432,8 +1415,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1503,8 +1485,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1574,8 +1555,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1645,8 +1625,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1716,8 +1695,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1787,8 +1765,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1858,8 +1835,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -1929,8 +1905,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2000,8 +1975,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2071,8 +2045,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2142,8 +2115,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -2213,8 +2185,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result index e50d2b1f837..0595c50e531 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result @@ -162,8 +162,8 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username status user2 not found username status @@ -174,27 +174,26 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 4 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 4 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -261,8 +260,8 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 1 user2 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -276,8 +275,8 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 1 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 @@ -286,8 +285,8 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 1 user2 wait/synch/mutex/sql/LOCK_connection_count 0 user2 wait/synch/mutex/sql/LOCK_user_locks 0 @@ -298,13 +297,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 5 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 5 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -396,13 +394,13 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username status user3 not found username status @@ -411,35 +409,34 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 8 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 8 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -524,13 +521,13 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 1 user3 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -542,12 +539,12 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 1 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 @@ -556,12 +553,12 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 1 user3 wait/synch/mutex/sql/LOCK_connection_count 0 user3 wait/synch/mutex/sql/LOCK_user_locks 0 @@ -572,13 +569,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 9 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 9 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -688,61 +684,60 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username status user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 12 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 12 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -845,18 +840,18 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 1 user4 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -866,16 +861,16 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 1 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 @@ -884,16 +879,16 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 1 user4 wait/synch/mutex/sql/LOCK_connection_count 0 user4 wait/synch/mutex/sql/LOCK_user_locks 0 @@ -904,13 +899,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 13 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 13 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1038,72 +1032,71 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 4 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 16 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 16 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1226,68 +1219,67 @@ user1 not found username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 4 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 17 wait/synch/mutex/sql/LOCK_connection_count 1 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 17 wait/synch/mutex/sql/LOCK_connection_count 1 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1413,63 +1405,62 @@ user2 not found username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 5 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 4 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 18 wait/synch/mutex/sql/LOCK_connection_count 2 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 18 wait/synch/mutex/sql/LOCK_connection_count 2 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1597,58 +1588,57 @@ user3 not found username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 5 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 5 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 4 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 5 user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 19 wait/synch/mutex/sql/LOCK_connection_count 3 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 19 wait/synch/mutex/sql/LOCK_connection_count 3 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1779,52 +1769,51 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 5 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 5 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 5 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 5 user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 5 user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1956,52 +1945,51 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 5 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 5 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 5 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 5 user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 5 user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -2151,34 +2139,33 @@ execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 5 user1 wait/synch/mutex/sql/LOCK_connection_count 1 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 user2 wait/io/file/sql/query_log 5 user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 5 user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 5 user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -2348,14 +2335,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -2525,14 +2511,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -2708,8 +2693,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -2885,8 +2869,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -3062,8 +3045,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3239,8 +3221,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3416,8 +3397,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3593,8 +3573,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3770,8 +3749,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3947,8 +3925,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -4124,8 +4101,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -4301,8 +4277,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -4478,8 +4453,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -4639,8 +4613,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -4748,8 +4721,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -4821,8 +4793,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result index 4f1dddb3f16..532fd209e18 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result @@ -173,8 +173,8 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username status user2 not found username status @@ -185,27 +185,26 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 2 -localhost wait/synch/rwlock/sql/LOCK_grant 2 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 4 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 4 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -271,8 +270,8 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 1 user2 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -286,8 +285,8 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 1 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 @@ -298,19 +297,18 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 5 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 2 -localhost wait/synch/rwlock/sql/LOCK_grant 2 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 5 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 5 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -392,13 +390,13 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username status user3 not found username status @@ -407,31 +405,30 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 8 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 4 -localhost wait/synch/rwlock/sql/LOCK_grant 4 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 8 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 8 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -506,13 +503,13 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 1 user3 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -524,12 +521,12 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 1 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 @@ -540,19 +537,18 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 9 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 4 -localhost wait/synch/rwlock/sql/LOCK_grant 4 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 9 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 9 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -643,53 +639,52 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username status user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 12 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 6 -localhost wait/synch/rwlock/sql/LOCK_grant 6 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 12 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 12 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -773,18 +768,18 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 1 user4 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -794,16 +789,16 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 1 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 @@ -814,19 +809,18 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 13 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 6 -localhost wait/synch/rwlock/sql/LOCK_grant 6 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 13 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 13 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -926,60 +920,59 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 4 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 16 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 16 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 16 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1074,56 +1067,55 @@ user1 not found username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 4 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 17 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 17 wait/synch/mutex/sql/LOCK_connection_count 1 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 17 wait/synch/mutex/sql/LOCK_connection_count 1 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1221,51 +1213,50 @@ user2 not found username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 5 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 4 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 18 localhost wait/synch/mutex/sql/LOCK_connection_count 2 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 18 wait/synch/mutex/sql/LOCK_connection_count 2 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 18 wait/synch/mutex/sql/LOCK_connection_count 2 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1365,46 +1356,45 @@ user3 not found username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 5 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 5 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 4 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 19 localhost wait/synch/mutex/sql/LOCK_connection_count 3 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 19 wait/synch/mutex/sql/LOCK_connection_count 3 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 19 wait/synch/mutex/sql/LOCK_connection_count 3 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1507,40 +1497,39 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 5 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 5 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 5 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 20 localhost wait/synch/mutex/sql/LOCK_connection_count 4 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1644,40 +1633,39 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 5 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 5 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 5 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 20 localhost wait/synch/mutex/sql/LOCK_connection_count 4 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1801,20 +1789,19 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 20 localhost wait/synch/mutex/sql/LOCK_connection_count 4 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1938,20 +1925,19 @@ execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 20 localhost wait/synch/mutex/sql/LOCK_connection_count 4 -localhost wait/synch/mutex/sql/LOCK_user_locks 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 +localhost wait/synch/mutex/sql/LOCK_user_locks 0 +localhost wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -2081,14 +2067,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -2224,8 +2209,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -2361,8 +2345,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -2498,8 +2481,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -2635,8 +2617,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -2772,8 +2753,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -2909,8 +2889,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3046,8 +3025,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3183,8 +3161,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3320,8 +3297,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3457,8 +3433,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3594,8 +3569,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3715,8 +3689,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3800,8 +3773,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3885,8 +3857,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result index 6de38e218ab..76c7311f99c 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result @@ -147,8 +147,8 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username status user2 not found username status @@ -159,8 +159,8 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; @@ -169,13 +169,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 4 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 4 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -232,8 +231,8 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 1 user2 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -247,8 +246,8 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 1 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 @@ -261,13 +260,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 5 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 5 -wait/synch/mutex/sql/LOCK_user_locks 2 -wait/synch/rwlock/sql/LOCK_grant 2 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -340,13 +338,13 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username status user3 not found username status @@ -355,12 +353,12 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; @@ -369,13 +367,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 8 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 8 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -441,13 +438,13 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 1 user3 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -459,12 +456,12 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 1 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 @@ -477,13 +474,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 9 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 9 -wait/synch/mutex/sql/LOCK_user_locks 4 -wait/synch/rwlock/sql/LOCK_grant 4 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -565,34 +561,34 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username status user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; @@ -601,13 +597,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 12 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 12 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -682,18 +677,18 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 1 user4 wait/synch/mutex/sql/LOCK_connection_count 0 @@ -703,16 +698,16 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 1 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 @@ -725,13 +720,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 13 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 13 -wait/synch/mutex/sql/LOCK_user_locks 6 -wait/synch/rwlock/sql/LOCK_grant 6 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -822,41 +816,41 @@ call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 4 user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_user_locks 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 +user1 wait/synch/mutex/sql/LOCK_user_locks 0 +user1 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 4 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 4 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; @@ -865,13 +859,12 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 16 wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 16 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -957,36 +950,36 @@ user1 not found username event_name count_star user2 wait/io/file/sql/query_log 4 user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/mutex/sql/LOCK_user_locks 0 +user2 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 4 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 4 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; @@ -995,14 +988,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 17 wait/synch/mutex/sql/LOCK_connection_count 1 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 17 wait/synch/mutex/sql/LOCK_connection_count 1 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1091,31 +1083,31 @@ user2 not found username event_name count_star user3 wait/io/file/sql/query_log 4 user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/mutex/sql/LOCK_user_locks 0 +user3 wait/synch/rwlock/sql/LOCK_grant 1 username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 5 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 4 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 4 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; @@ -1124,14 +1116,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 18 wait/synch/mutex/sql/LOCK_connection_count 2 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 18 wait/synch/mutex/sql/LOCK_connection_count 2 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1222,26 +1213,26 @@ user3 not found username event_name count_star user4 wait/io/file/sql/query_log 4 user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 +user4 wait/synch/mutex/sql/LOCK_user_locks 0 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 5 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 5 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 4 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; @@ -1250,14 +1241,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 19 wait/synch/mutex/sql/LOCK_connection_count 3 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 19 wait/synch/mutex/sql/LOCK_connection_count 3 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1351,20 +1341,20 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 5 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 5 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 5 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; @@ -1373,14 +1363,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1475,20 +1464,20 @@ execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 5 user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 user2 localhost wait/io/file/sql/query_log 5 user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 5 user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 5 user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; @@ -1497,14 +1486,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1621,14 +1609,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1745,14 +1732,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1869,14 +1855,13 @@ execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/mutex/sql/LOCK_user_locks 0 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -1999,8 +1984,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -2123,8 +2107,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 3 @@ -2247,8 +2230,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -2371,8 +2353,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -2495,8 +2476,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -2619,8 +2599,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -2743,8 +2722,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -2867,8 +2845,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -2991,8 +2968,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3115,8 +3091,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3239,8 +3214,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -3347,8 +3321,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3419,8 +3392,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -3491,8 +3463,7 @@ execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 20 wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_user_locks 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; diff --git a/mysql-test/suite/perfschema/r/func_mutex.result b/mysql-test/suite/perfschema/r/func_mutex.result index 60f531f42f7..86967a2a63f 100644 --- a/mysql-test/suite/perfschema/r/func_mutex.result +++ b/mysql-test/suite/perfschema/r/func_mutex.result @@ -5,9 +5,9 @@ WHERE name LIKE 'wait/synch/mutex/%' truncate table performance_schema.events_statements_summary_by_digest; flush status; select NAME from performance_schema.mutex_instances -where NAME = 'wait/synch/mutex/sql/LOCK_open'; +where NAME = 'wait/synch/mutex/sql/TABLE_SHARE::tdc.LOCK_table_share' GROUP BY NAME; NAME -wait/synch/mutex/sql/LOCK_open +wait/synch/mutex/sql/TABLE_SHARE::tdc.LOCK_table_share select NAME from performance_schema.rwlock_instances where NAME = 'wait/synch/rwlock/sql/LOCK_grant'; NAME @@ -24,7 +24,7 @@ id b 1 initial value SET @before_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long -WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_table_cache')); +WHERE (EVENT_NAME = 'wait/synch/mutex/sql/TABLE_SHARE::tdc.LOCK_table_share')); SELECT * FROM t1; id b 1 initial value @@ -37,12 +37,12 @@ id b 8 initial value SET @after_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long -WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_table_cache')); +WHERE (EVENT_NAME = 'wait/synch/mutex/sql/TABLE_SHARE::tdc.LOCK_table_share')); SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_timed; test_fm1_timed Success UPDATE performance_schema.setup_instruments SET enabled = 'NO' -WHERE NAME = 'wait/synch/mutex/sql/LOCK_table_cache'; +WHERE NAME = 'wait/synch/mutex/sql/TABLE_SHARE::tdc.LOCK_table_share'; TRUNCATE TABLE performance_schema.events_waits_history_long; TRUNCATE TABLE performance_schema.events_waits_history; TRUNCATE TABLE performance_schema.events_waits_current; @@ -51,7 +51,7 @@ id b 1 initial value SET @before_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long -WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_table_cache')); +WHERE (EVENT_NAME = 'wait/synch/mutex/sql/TABLE_SHARE::tdc.LOCK_table_share')); SELECT * FROM t1; id b 1 initial value @@ -64,59 +64,41 @@ id b 8 initial value SET @after_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long -WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_table_cache')); +WHERE (EVENT_NAME = 'wait/synch/mutex/sql/TABLE_SHARE::tdc.LOCK_table_share')); SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_timed; test_fm2_timed Success TRUNCATE TABLE performance_schema.events_waits_history_long; TRUNCATE TABLE performance_schema.events_waits_history; TRUNCATE TABLE performance_schema.events_waits_current; -SELECT * FROM t1 WHERE id = 1; -id b -1 initial value +show variables like "%not_found%"; +Variable_name Value SET @before_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long -WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); -SELECT * FROM t1; -id b -1 initial value -2 initial value -3 initial value -4 initial value -5 initial value -6 initial value -7 initial value -8 initial value +WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash')); +show variables like "%not_found%"; +Variable_name Value SET @after_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long -WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); +WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash')); SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_rw_timed; test_fm1_rw_timed Success UPDATE performance_schema.setup_instruments SET enabled = 'NO' -WHERE NAME = 'wait/synch/rwlock/sql/LOCK_grant'; +WHERE NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash'; TRUNCATE TABLE performance_schema.events_waits_history_long; TRUNCATE TABLE performance_schema.events_waits_history; TRUNCATE TABLE performance_schema.events_waits_current; -SELECT * FROM t1 WHERE id = 1; -id b -1 initial value +show variables like "%not_found%"; +Variable_name Value SET @before_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long -WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); -SELECT * FROM t1; -id b -1 initial value -2 initial value -3 initial value -4 initial value -5 initial value -6 initial value -7 initial value -8 initial value +WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash')); +show variables like "%not_found%"; +Variable_name Value SET @after_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long -WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); +WHERE (EVENT_NAME = 'LOCK_system_variables_hash')); SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_rw_timed; test_fm2_rw_timed Success diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result index 4035e299c23..ffe3dc2e0eb 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result @@ -30,7 +30,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -101,4 +101,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result index 2a426380295..08f280f30a9 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result @@ -29,8 +29,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -59,7 +59,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -88,4 +88,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result index ce2437a495b..7c658e17c55 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result @@ -30,7 +30,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -101,4 +101,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result index 1e89e1aece7..924b66cf726 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result @@ -29,8 +29,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -59,7 +59,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -88,4 +88,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result index 00d2755c5b9..5657887e439 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result @@ -30,7 +30,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -101,4 +101,4 @@ FIRST_ERROR_SEEN null LAST_ERROR_SEEN null revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result index b019decc680..1846dbe0719 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result @@ -29,8 +29,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; -ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST santa.claus.ipv4.example.com @@ -59,7 +59,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server +ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST santa.claus.ipv4.example.com @@ -88,4 +88,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result index 271a9ed49a6..115af4792c3 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result @@ -31,7 +31,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -104,4 +104,4 @@ revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result index d1064f0986c..618bcea553d 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result @@ -29,8 +29,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -59,7 +59,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -88,4 +88,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result index 2b48924c981..6cc93cd4a7f 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result @@ -33,7 +33,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; uninstall plugin test_plugin_server; ERROR HY000: Plugin 'test_plugin_server' is not loaded "Dumping performance_schema.host_cache" @@ -196,4 +196,5 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv4.example.com' FROM 'plug'@'santa.claus.ipv4.example.com'; DROP USER 'plug'@'santa.claus.ipv4.example.com'; DROP USER 'plug_dest'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; +delete from mysql.plugin where name='test_plugin_server'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result index e0342e7acdd..6f5affadd2f 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result @@ -33,7 +33,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply"; ERROR 08S01: Bad handshake "Dumping performance_schema.host_cache" IP 192.0.2.4 @@ -238,10 +238,10 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= "-d,native_password_bad_reply"; +set global debug_dbug= "-d,native_password_bad_reply"; message Valid connection should reset SUM_CONNECT_ERROR counter -set global debug= "+d,native_password_bad_reply"; +set global debug_dbug= "+d,native_password_bad_reply"; "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST santa.claus.ipv4.example.com @@ -420,4 +420,4 @@ drop user 'root'@'santa.claus.ipv4.example.com'; revoke select on test.* from 'quota'@'santa.claus.ipv4.example.com'; drop user 'quota'@'santa.claus.ipv4.example.com'; set global max_connect_errors = @saved_max_connect_errors; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result index 8ff7fcac7c4..baf9eae9f5c 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result @@ -29,8 +29,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_format_ipv4"; -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_format_ipv4"; +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -59,7 +59,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -88,4 +88,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result index 17e918e4926..31e4bc9f843 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result @@ -10,7 +10,7 @@ select @@global.max_connect_errors; 100 select @@global.max_user_connections; @@global.max_user_connections -0 +1024 select @@global.max_connections; @@global.max_connections 151 @@ -23,6 +23,7 @@ User Host select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; User Host select @@global.max_connections into @saved_max_connections; +select @@global.max_user_connections into @saved_max_user_connections; create user 'quota'@'santa.claus.ipv4.example.com'; grant select on test.* to 'quota'@'santa.claus.ipv4.example.com'; grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com' @@ -33,7 +34,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; select "Con2a is alive"; Con2a is alive Con2a is alive @@ -653,5 +654,6 @@ COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set set global max_connections = @saved_max_connections; +set global max_user_connections = @saved_max_user_connections; drop user 'quota'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result index 1de2f228aac..6531f7e69f0 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result @@ -31,7 +31,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -100,7 +100,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; select "Con4 is alive"; Con4 is alive Con4 is alive @@ -173,4 +173,4 @@ revoke select on test.* from 'root'@'192.0.2.4'; revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'192.0.2.4'; drop user 'root'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result index 0f9dd8cb3bf..2976f8c9e16 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result @@ -29,8 +29,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -59,7 +59,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -88,8 +88,8 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; -ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST santa.claus.ipv4.example.com @@ -118,7 +118,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server +ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST santa.claus.ipv4.example.com @@ -147,4 +147,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result index c094c4d7901..315f90ce3e5 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result @@ -30,7 +30,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -101,4 +101,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result index 7ced741a67b..f27bda9ada1 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result @@ -29,8 +29,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -59,7 +59,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -88,4 +88,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result index ee47f030efc..69f68de8d90 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result @@ -33,7 +33,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv4.example.com' (using password: YES) "Dumping performance_schema.host_cache" IP 192.0.2.4 @@ -210,4 +210,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set drop user 'user_with'@'santa.claus.ipv4.example.com'; drop user 'user_without'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result index acbb6f091f0..a3d2b1d273f 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result @@ -37,7 +37,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv4.example.com' (using password: NO) "Dumping performance_schema.host_cache" IP 192.0.2.4 @@ -156,4 +156,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set drop user 'user_ssl'@'santa.claus.ipv4.example.com'; drop user 'user_ssl_x509'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result index a8e22f1652a..59a12495352 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result @@ -30,7 +30,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -101,4 +101,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set revoke select on test.* from 'root'@'2001:db8::6:6'; drop user 'root'@'2001:db8::6:6'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result index ae9bc7f437f..d241bede905 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result @@ -29,8 +29,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again"; -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again"; +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -59,7 +59,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -88,4 +88,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result index c2b8bae92b9..904139875c6 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result @@ -30,7 +30,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -101,4 +101,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set revoke select on test.* from 'root'@'2001:db8::6:6'; drop user 'root'@'2001:db8::6:6'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result index 530fb4c0c4a..b14fb2f955e 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result @@ -29,8 +29,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -59,7 +59,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -88,4 +88,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result index 66c7eb18faa..f5b2f43ab91 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result @@ -30,7 +30,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -101,4 +101,4 @@ FIRST_ERROR_SEEN null LAST_ERROR_SEEN null revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result index c35c883ad01..b88bb94343f 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result @@ -28,8 +28,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; -ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST santa.claus.ipv6.example.com @@ -58,7 +58,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MySQL server +ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST santa.claus.ipv6.example.com @@ -87,4 +87,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result index 4a60a2a7da7..9cc8a675fcc 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result @@ -31,7 +31,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -104,4 +104,4 @@ revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; revoke select on test.* from 'root'@'2001:db8::6:6'; drop user 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'2001:db8::6:6'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result index 829e9005dfb..73741cf42ed 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result @@ -29,8 +29,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -59,7 +59,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -88,4 +88,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result index 61a84d06d6c..8042071c68f 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result @@ -33,7 +33,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; uninstall plugin test_plugin_server; ERROR HY000: Plugin 'test_plugin_server' is not loaded "Dumping performance_schema.host_cache" @@ -196,4 +196,5 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv6.example.com' FROM 'plug'@'santa.claus.ipv6.example.com'; DROP USER 'plug'@'santa.claus.ipv6.example.com'; DROP USER 'plug_dest'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; +delete from mysql.plugin where name='test_plugin_server'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result index 6fbf4108422..5d1846f3354 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result @@ -33,7 +33,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply"; ERROR 08S01: Bad handshake "Dumping performance_schema.host_cache" IP 2001:db8::6:6 @@ -238,10 +238,10 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= "-d,native_password_bad_reply"; +set global debug_dbug= "-d,native_password_bad_reply"; message Valid connection should reset SUM_CONNECT_ERROR counter -set global debug= "+d,native_password_bad_reply"; +set global debug_dbug= "+d,native_password_bad_reply"; "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST santa.claus.ipv6.example.com @@ -420,4 +420,4 @@ drop user 'root'@'santa.claus.ipv6.example.com'; revoke select on test.* from 'quota'@'santa.claus.ipv6.example.com'; drop user 'quota'@'santa.claus.ipv6.example.com'; set global max_connect_errors = @saved_max_connect_errors; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result index b3b2e34c433..4416b78d009 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result @@ -10,7 +10,7 @@ select @@global.max_connect_errors; 100 select @@global.max_user_connections; @@global.max_user_connections -0 +1024 select @@global.max_connections; @@global.max_connections 151 @@ -23,6 +23,7 @@ User Host select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; User Host select @@global.max_connections into @saved_max_connections; +select @@global.max_user_connections into @saved_max_user_connections; create user 'quota'@'santa.claus.ipv6.example.com'; grant select on test.* to 'quota'@'santa.claus.ipv6.example.com'; grant usage on *.* to 'quota'@'santa.claus.ipv6.example.com' @@ -33,7 +34,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; select "Con2a is alive"; Con2a is alive Con2a is alive @@ -653,5 +654,6 @@ COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set set global max_connections = @saved_max_connections; +set global max_user_connections = @saved_max_user_connections; drop user 'quota'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result index ef4bb102be6..a2107324c65 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result @@ -31,7 +31,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -100,7 +100,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; select "Con4 is alive"; Con4 is alive Con4 is alive @@ -173,4 +173,4 @@ revoke select on test.* from 'root'@'2001:db8::6:6'; revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'2001:db8::6:6'; drop user 'root'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result index 9e597f41d41..373ed10677a 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result @@ -29,8 +29,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -59,7 +59,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -88,8 +88,8 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; -ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST santa.claus.ipv6.example.com @@ -118,7 +118,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MySQL server +ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST santa.claus.ipv6.example.com @@ -147,4 +147,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result index d1e91e9b431..809644cbe08 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result @@ -30,7 +30,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -101,4 +101,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set revoke select on test.* from 'root'@'2001:db8::6:6'; drop user 'root'@'2001:db8::6:6'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result index 0e0b248beea..32a06e8105f 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result @@ -29,8 +29,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -59,7 +59,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -88,4 +88,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result index fdf90c614d1..5c3b363c5cd 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result @@ -33,7 +33,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv6.example.com' (using password: YES) "Dumping performance_schema.host_cache" IP 2001:db8::6:6 @@ -210,4 +210,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set drop user 'user_with'@'santa.claus.ipv6.example.com'; drop user 'user_without'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result index 7d8fd72159f..422db77b5ae 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result @@ -37,7 +37,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv6.example.com' (using password: NO) "Dumping performance_schema.host_cache" IP 2001:db8::6:6 @@ -156,4 +156,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set drop user 'user_ssl'@'santa.claus.ipv6.example.com'; drop user 'user_ssl_x509'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result index add37fe0319..70618be6145 100644 --- a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result +++ b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result @@ -36,7 +36,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_error"; +set global debug_dbug= "+d,vio_peer_addr_error"; ERROR HY000: Can't get hostname for your address show global status like "connection_errors_%"; Variable_name Value @@ -57,7 +57,7 @@ Connection_errors_peer_address 2 Connection_errors_select 0 Connection_errors_tcpwrap 0 "Dumping performance_schema.host_cache" -set global debug= default; +set global debug_dbug= default; flush status; show global status like "connection_errors_%"; Variable_name Value diff --git a/mysql-test/suite/perfschema/r/innodb_table_io.result b/mysql-test/suite/perfschema/r/innodb_table_io.result index 460518aeb65..9b5bd783f88 100644 --- a/mysql-test/suite/perfschema/r/innodb_table_io.result +++ b/mysql-test/suite/perfschema/r/innodb_table_io.result @@ -106,6 +106,9 @@ wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL diff --git a/mysql-test/suite/perfschema/r/misc.result b/mysql-test/suite/perfschema/r/misc.result index fd8f93c129f..a50c4ffa297 100644 --- a/mysql-test/suite/perfschema/r/misc.result +++ b/mysql-test/suite/perfschema/r/misc.result @@ -42,12 +42,12 @@ AND EVENT_NAME IN WHERE NAME LIKE "wait/synch/%") LIMIT 1; create table test.t1(a int) engine=performance_schema; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") SELECT object_schema, object_name FROM performance_schema.objects_summary_global_by_type WHERE object_schema='test'; object_schema object_name create table test.t1 like performance_schema.events_waits_current; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") SELECT object_schema, object_name FROM performance_schema.objects_summary_global_by_type WHERE object_schema='test'; object_schema object_name diff --git a/mysql-test/suite/perfschema/r/multi_table_io.result b/mysql-test/suite/perfschema/r/multi_table_io.result index 35d8b347b5d..74c8b94c1d5 100644 --- a/mysql-test/suite/perfschema/r/multi_table_io.result +++ b/mysql-test/suite/perfschema/r/multi_table_io.result @@ -52,14 +52,23 @@ where event_name like 'wait/io/table/%' and object_schema in ('test','test1') order by thread_id, event_id; event_name short_source object_type object_schema pretty_name operation number_of_bytes +wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL wait/io/table/sql/handler handler.cc: TABLE test1 t2 insert NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL +wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL +wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL +wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch NULL wait/io/table/sql/handler handler.cc: TABLE test t1 update NULL wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch NULL wait/io/table/sql/handler handler.cc: TABLE test1 t2 update NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL +wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch NULL wait/io/table/sql/handler handler.cc: TABLE test t1 delete NULL wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch NULL wait/io/table/sql/handler handler.cc: TABLE test1 t2 delete NULL diff --git a/mysql-test/suite/perfschema/r/myisam_file_io.result b/mysql-test/suite/perfschema/r/myisam_file_io.result index f7bb9238311..ea1e0bd52b8 100644 --- a/mysql-test/suite/perfschema/r/myisam_file_io.result +++ b/mysql-test/suite/perfschema/r/myisam_file_io.result @@ -18,6 +18,7 @@ substring(object_name, locate("no_index_tab", object_name)) as short_name from performance_schema.events_waits_history_long where operation not like "tell" and event_name like "wait/io/file/myisam/%" + having short_name <> "" order by thread_id, event_id; event_name short_source operation number_of_bytes short_name wait/io/file/myisam/kfile mi_create.c: create NULL no_index_tab.MYI diff --git a/mysql-test/suite/perfschema/r/nesting.result b/mysql-test/suite/perfschema/r/nesting.result index 3c2796dbad9..06bf039b36f 100644 --- a/mysql-test/suite/perfschema/r/nesting.result +++ b/mysql-test/suite/perfschema/r/nesting.result @@ -107,128 +107,135 @@ and (end_event_id <= @marker_end) ) all_events order by relative_event_id asc; relative_event_id relative_end_event_id event_name comment nesting_event_type relative_nesting_event_id -0 17 statement/sql/select select "MARKER_BEGIN" as marker NULL NULL -1 5 stage/sql/init (stage) STATEMENT 0 +0 18 statement/sql/select select "MARKER_BEGIN" as marker NULL NULL +1 4 stage/sql/init (stage) STATEMENT 0 2 2 wait/io/socket/sql/client_connection recv STAGE 1 3 3 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 1 -4 4 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 1 -5 5 wait/io/file/sql/query_log write STAGE 1 -6 6 stage/sql/checking permissions (stage) STATEMENT 0 -7 7 stage/sql/Opening tables (stage) STATEMENT 0 -8 8 stage/sql/init (stage) STATEMENT 0 -9 9 stage/sql/optimizing (stage) STATEMENT 0 -10 10 stage/sql/executing (stage) STATEMENT 0 -11 11 stage/sql/end (stage) STATEMENT 0 -12 12 stage/sql/query end (stage) STATEMENT 0 -13 13 stage/sql/closing tables (stage) STATEMENT 0 -14 15 stage/sql/freeing items (stage) STATEMENT 0 -15 15 wait/io/socket/sql/client_connection send STAGE 14 -16 17 stage/sql/cleaning up (stage) STATEMENT 0 -17 17 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 16 -18 18 idle idle NULL NULL -19 36 statement/sql/select select "This is simple statement one" as payload NULL NULL -20 24 stage/sql/init (stage) STATEMENT 19 -21 21 wait/io/socket/sql/client_connection recv STAGE 20 -22 22 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 20 -23 23 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 20 -24 24 wait/io/file/sql/query_log write STAGE 20 -25 25 stage/sql/checking permissions (stage) STATEMENT 19 -26 26 stage/sql/Opening tables (stage) STATEMENT 19 -27 27 stage/sql/init (stage) STATEMENT 19 -28 28 stage/sql/optimizing (stage) STATEMENT 19 -29 29 stage/sql/executing (stage) STATEMENT 19 -30 30 stage/sql/end (stage) STATEMENT 19 -31 31 stage/sql/query end (stage) STATEMENT 19 -32 32 stage/sql/closing tables (stage) STATEMENT 19 -33 34 stage/sql/freeing items (stage) STATEMENT 19 -34 34 wait/io/socket/sql/client_connection send STAGE 33 -35 36 stage/sql/cleaning up (stage) STATEMENT 19 -36 36 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 35 -37 37 idle idle NULL NULL -38 55 statement/sql/select select "This is simple statement two" as payload NULL NULL -39 43 stage/sql/init (stage) STATEMENT 38 -40 40 wait/io/socket/sql/client_connection recv STAGE 39 -41 41 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 39 -42 42 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 39 -43 43 wait/io/file/sql/query_log write STAGE 39 -44 44 stage/sql/checking permissions (stage) STATEMENT 38 -45 45 stage/sql/Opening tables (stage) STATEMENT 38 -46 46 stage/sql/init (stage) STATEMENT 38 -47 47 stage/sql/optimizing (stage) STATEMENT 38 -48 48 stage/sql/executing (stage) STATEMENT 38 -49 49 stage/sql/end (stage) STATEMENT 38 -50 50 stage/sql/query end (stage) STATEMENT 38 -51 51 stage/sql/closing tables (stage) STATEMENT 38 -52 53 stage/sql/freeing items (stage) STATEMENT 38 -53 53 wait/io/socket/sql/client_connection send STAGE 52 -54 55 stage/sql/cleaning up (stage) STATEMENT 38 -55 55 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 54 -56 56 idle idle NULL NULL -57 72 statement/sql/select select "This is the first part of a multi query" as payload; +4 4 wait/io/file/sql/query_log write STAGE 1 +5 5 stage/sql/checking permissions (stage) STATEMENT 0 +6 6 stage/sql/Opening tables (stage) STATEMENT 0 +7 7 stage/sql/init (stage) STATEMENT 0 +8 8 stage/sql/optimizing (stage) STATEMENT 0 +9 9 stage/sql/executing (stage) STATEMENT 0 +10 10 stage/sql/end (stage) STATEMENT 0 +11 11 stage/sql/query end (stage) STATEMENT 0 +12 12 stage/sql/closing tables (stage) STATEMENT 0 +13 13 stage/sql/freeing items (stage) STATEMENT 0 +14 14 wait/io/socket/sql/client_connection send STATEMENT 0 +15 15 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 0 +16 16 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 0 +17 18 stage/sql/cleaning up (stage) STATEMENT 0 +18 18 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 17 +19 19 idle idle NULL NULL +20 38 statement/sql/select select "This is simple statement one" as payload NULL NULL +21 24 stage/sql/init (stage) STATEMENT 20 +22 22 wait/io/socket/sql/client_connection recv STAGE 21 +23 23 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 21 +24 24 wait/io/file/sql/query_log write STAGE 21 +25 25 stage/sql/checking permissions (stage) STATEMENT 20 +26 26 stage/sql/Opening tables (stage) STATEMENT 20 +27 27 stage/sql/init (stage) STATEMENT 20 +28 28 stage/sql/optimizing (stage) STATEMENT 20 +29 29 stage/sql/executing (stage) STATEMENT 20 +30 30 stage/sql/end (stage) STATEMENT 20 +31 31 stage/sql/query end (stage) STATEMENT 20 +32 32 stage/sql/closing tables (stage) STATEMENT 20 +33 33 stage/sql/freeing items (stage) STATEMENT 20 +34 34 wait/io/socket/sql/client_connection send STATEMENT 20 +35 35 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 20 +36 36 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 20 +37 38 stage/sql/cleaning up (stage) STATEMENT 20 +38 38 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 37 +39 39 idle idle NULL NULL +40 58 statement/sql/select select "This is simple statement two" as payload NULL NULL +41 44 stage/sql/init (stage) STATEMENT 40 +42 42 wait/io/socket/sql/client_connection recv STAGE 41 +43 43 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 41 +44 44 wait/io/file/sql/query_log write STAGE 41 +45 45 stage/sql/checking permissions (stage) STATEMENT 40 +46 46 stage/sql/Opening tables (stage) STATEMENT 40 +47 47 stage/sql/init (stage) STATEMENT 40 +48 48 stage/sql/optimizing (stage) STATEMENT 40 +49 49 stage/sql/executing (stage) STATEMENT 40 +50 50 stage/sql/end (stage) STATEMENT 40 +51 51 stage/sql/query end (stage) STATEMENT 40 +52 52 stage/sql/closing tables (stage) STATEMENT 40 +53 53 stage/sql/freeing items (stage) STATEMENT 40 +54 54 wait/io/socket/sql/client_connection send STATEMENT 40 +55 55 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 40 +56 56 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 40 +57 58 stage/sql/cleaning up (stage) STATEMENT 40 +58 58 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 57 +59 59 idle idle NULL NULL +60 76 statement/sql/select select "This is the first part of a multi query" as payload; select "And this is the second part of a multi query" as payload; select "With a third part to make things complete" as payload NULL NULL -58 62 stage/sql/init (stage) STATEMENT 57 -59 59 wait/io/socket/sql/client_connection recv STAGE 58 -60 60 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 58 -61 61 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 58 -62 62 wait/io/file/sql/query_log write STAGE 58 -63 63 stage/sql/checking permissions (stage) STATEMENT 57 -64 64 stage/sql/Opening tables (stage) STATEMENT 57 -65 65 stage/sql/init (stage) STATEMENT 57 -66 66 stage/sql/optimizing (stage) STATEMENT 57 -67 67 stage/sql/executing (stage) STATEMENT 57 -68 68 stage/sql/end (stage) STATEMENT 57 -69 69 stage/sql/query end (stage) STATEMENT 57 -70 70 stage/sql/closing tables (stage) STATEMENT 57 -71 72 stage/sql/freeing items (stage) STATEMENT 57 -72 72 wait/io/socket/sql/client_connection send STAGE 71 -73 86 statement/sql/select select "And this is the second part of a multi query" as payload; +61 64 stage/sql/init (stage) STATEMENT 60 +62 62 wait/io/socket/sql/client_connection recv STAGE 61 +63 63 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 61 +64 64 wait/io/file/sql/query_log write STAGE 61 +65 65 stage/sql/checking permissions (stage) STATEMENT 60 +66 66 stage/sql/Opening tables (stage) STATEMENT 60 +67 67 stage/sql/init (stage) STATEMENT 60 +68 68 stage/sql/optimizing (stage) STATEMENT 60 +69 69 stage/sql/executing (stage) STATEMENT 60 +70 70 stage/sql/end (stage) STATEMENT 60 +71 71 stage/sql/query end (stage) STATEMENT 60 +72 72 stage/sql/closing tables (stage) STATEMENT 60 +73 76 stage/sql/freeing items (stage) STATEMENT 60 +74 74 wait/io/socket/sql/client_connection send STAGE 73 +75 75 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 73 +76 76 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 73 +77 91 statement/sql/select select "And this is the second part of a multi query" as payload; select "With a third part to make things complete" as payload NULL NULL -74 76 stage/sql/init (stage) STATEMENT 73 -75 75 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 74 -76 76 wait/io/file/sql/query_log write STAGE 74 -77 77 stage/sql/checking permissions (stage) STATEMENT 73 -78 78 stage/sql/Opening tables (stage) STATEMENT 73 -79 79 stage/sql/init (stage) STATEMENT 73 -80 80 stage/sql/optimizing (stage) STATEMENT 73 -81 81 stage/sql/executing (stage) STATEMENT 73 -82 82 stage/sql/end (stage) STATEMENT 73 -83 83 stage/sql/query end (stage) STATEMENT 73 -84 84 stage/sql/closing tables (stage) STATEMENT 73 -85 86 stage/sql/freeing items (stage) STATEMENT 73 -86 86 wait/io/socket/sql/client_connection send STAGE 85 -87 102 statement/sql/select select "With a third part to make things complete" as payload NULL NULL -88 90 stage/sql/init (stage) STATEMENT 87 -89 89 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 88 -90 90 wait/io/file/sql/query_log write STAGE 88 -91 91 stage/sql/checking permissions (stage) STATEMENT 87 -92 92 stage/sql/Opening tables (stage) STATEMENT 87 -93 93 stage/sql/init (stage) STATEMENT 87 -94 94 stage/sql/optimizing (stage) STATEMENT 87 -95 95 stage/sql/executing (stage) STATEMENT 87 -96 96 stage/sql/end (stage) STATEMENT 87 -97 97 stage/sql/query end (stage) STATEMENT 87 -98 98 stage/sql/closing tables (stage) STATEMENT 87 -99 100 stage/sql/freeing items (stage) STATEMENT 87 -100 100 wait/io/socket/sql/client_connection send STAGE 99 -101 102 stage/sql/cleaning up (stage) STATEMENT 87 -102 102 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 101 -103 103 idle idle NULL NULL -104 121 statement/sql/select select "MARKER_END" as marker NULL NULL -105 109 stage/sql/init (stage) STATEMENT 104 -106 106 wait/io/socket/sql/client_connection recv STAGE 105 -107 107 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 105 -108 108 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 105 -109 109 wait/io/file/sql/query_log write STAGE 105 -110 110 stage/sql/checking permissions (stage) STATEMENT 104 -111 111 stage/sql/Opening tables (stage) STATEMENT 104 -112 112 stage/sql/init (stage) STATEMENT 104 -113 113 stage/sql/optimizing (stage) STATEMENT 104 -114 114 stage/sql/executing (stage) STATEMENT 104 -115 115 stage/sql/end (stage) STATEMENT 104 -116 116 stage/sql/query end (stage) STATEMENT 104 -117 117 stage/sql/closing tables (stage) STATEMENT 104 -118 119 stage/sql/freeing items (stage) STATEMENT 104 -119 119 wait/io/socket/sql/client_connection send STAGE 118 -120 121 stage/sql/cleaning up (stage) STATEMENT 104 -121 121 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 120 +78 79 stage/sql/init (stage) STATEMENT 77 +79 79 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 78 +80 80 stage/sql/checking permissions (stage) STATEMENT 77 +81 81 stage/sql/Opening tables (stage) STATEMENT 77 +82 82 stage/sql/init (stage) STATEMENT 77 +83 83 stage/sql/optimizing (stage) STATEMENT 77 +84 84 stage/sql/executing (stage) STATEMENT 77 +85 85 stage/sql/end (stage) STATEMENT 77 +86 86 stage/sql/query end (stage) STATEMENT 77 +87 87 stage/sql/closing tables (stage) STATEMENT 77 +88 91 stage/sql/freeing items (stage) STATEMENT 77 +89 89 wait/io/socket/sql/client_connection send STAGE 88 +90 90 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 88 +91 91 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 88 +92 108 statement/sql/select select "With a third part to make things complete" as payload NULL NULL +93 94 stage/sql/init (stage) STATEMENT 92 +94 94 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 93 +95 95 stage/sql/checking permissions (stage) STATEMENT 92 +96 96 stage/sql/Opening tables (stage) STATEMENT 92 +97 97 stage/sql/init (stage) STATEMENT 92 +98 98 stage/sql/optimizing (stage) STATEMENT 92 +99 99 stage/sql/executing (stage) STATEMENT 92 +100 100 stage/sql/end (stage) STATEMENT 92 +101 101 stage/sql/query end (stage) STATEMENT 92 +102 102 stage/sql/closing tables (stage) STATEMENT 92 +103 103 stage/sql/freeing items (stage) STATEMENT 92 +104 104 wait/io/socket/sql/client_connection send STATEMENT 92 +105 105 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 92 +106 106 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 92 +107 108 stage/sql/cleaning up (stage) STATEMENT 92 +108 108 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 107 +109 109 idle idle NULL NULL +110 128 statement/sql/select select "MARKER_END" as marker NULL NULL +111 114 stage/sql/init (stage) STATEMENT 110 +112 112 wait/io/socket/sql/client_connection recv STAGE 111 +113 113 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 111 +114 114 wait/io/file/sql/query_log write STAGE 111 +115 115 stage/sql/checking permissions (stage) STATEMENT 110 +116 116 stage/sql/Opening tables (stage) STATEMENT 110 +117 117 stage/sql/init (stage) STATEMENT 110 +118 118 stage/sql/optimizing (stage) STATEMENT 110 +119 119 stage/sql/executing (stage) STATEMENT 110 +120 120 stage/sql/end (stage) STATEMENT 110 +121 121 stage/sql/query end (stage) STATEMENT 110 +122 122 stage/sql/closing tables (stage) STATEMENT 110 +123 123 stage/sql/freeing items (stage) STATEMENT 110 +124 124 wait/io/socket/sql/client_connection send STATEMENT 110 +125 125 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 110 +126 126 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 110 +127 128 stage/sql/cleaning up (stage) STATEMENT 110 +128 128 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 127 diff --git a/mysql-test/suite/perfschema/r/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result index e8fd6fcc19b..bef2759da41 100644 --- a/mysql-test/suite/perfschema/r/ortho_iter.result +++ b/mysql-test/suite/perfschema/r/ortho_iter.result @@ -116,7 +116,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_event.result b/mysql-test/suite/perfschema/r/pfs_upgrade_event.result index 65c76d8decc..cbd684a6232 100644 --- a/mysql-test/suite/perfschema/r/pfs_upgrade_event.result +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_event.result @@ -3,62 +3,58 @@ drop event if exists test.user_event; create event test.user_event on schedule every 1 day do select "not supposed to be here"; update mysql.event set db='performance_schema' where name='user_event'; -Warning: Using a password on the command line interface can be insecure. -Warning: Using a password on the command line interface can be insecure. -Warning: Using a password on the command line interface can be insecure. -ERROR 1050 (42S01) at line 164: Table 'cond_instances' already exists -ERROR 1050 (42S01) at line 189: Table 'events_waits_current' already exists -ERROR 1050 (42S01) at line 214: Table 'events_waits_history' already exists -ERROR 1050 (42S01) at line 239: Table 'events_waits_history_long' already exists -ERROR 1050 (42S01) at line 252: Table 'events_waits_summary_by_instance' already exists -ERROR 1050 (42S01) at line 265: Table 'events_waits_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 278: Table 'events_waits_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 292: Table 'events_waits_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 305: Table 'events_waits_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 317: Table 'events_waits_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 326: Table 'file_instances' already exists -ERROR 1050 (42S01) at line 355: Table 'file_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 386: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 399: Table 'socket_instances' already exists -ERROR 1050 (42S01) at line 429: Table 'socket_summary_by_instance' already exists -ERROR 1050 (42S01) at line 458: Table 'socket_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 493: Table 'host_cache' already exists -ERROR 1050 (42S01) at line 502: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 516: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 526: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 536: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 545: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 553: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 562: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 573: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 581: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 626: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 670: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 749: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 769: Table 'threads' already exists -ERROR 1050 (42S01) at line 785: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 801: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 817: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 830: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 843: Table 'events_stages_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 856: Table 'events_stages_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 870: Table 'events_stages_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 882: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 928: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 974: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 1020: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 1084: Table 'events_statements_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 1149: Table 'events_statements_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 1180: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 1189: Table 'hosts' already exists -ERROR 1050 (42S01) at line 1198: Table 'users' already exists -ERROR 1050 (42S01) at line 1208: Table 'accounts' already exists -ERROR 1050 (42S01) at line 1243: Table 'events_statements_summary_by_digest' already exists -ERROR 1050 (42S01) at line 1253: Table 'session_connect_attrs' already exists -ERROR 1050 (42S01) at line 1259: Table 'session_account_connect_attrs' already exists -ERROR 1644 (HY000) at line 1852: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line ###: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'file_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line ###: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'host_cache' already exists +ERROR 1050 (42S01) at line ###: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line ###: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line ###: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line ###: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line ###: Table 'threads' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'hosts' already exists +ERROR 1050 (42S01) at line ###: Table 'users' already exists +ERROR 1050 (42S01) at line ###: Table 'accounts' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_digest' already exists +ERROR 1050 (42S01) at line ###: Table 'session_connect_attrs' already exists +ERROR 1050 (42S01) at line ###: Table 'session_account_connect_attrs' already exists FATAL ERROR: Upgrade failed select name from mysql.event where db='performance_schema'; name diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_func.result b/mysql-test/suite/perfschema/r/pfs_upgrade_func.result index 3bd4ddd9505..6978e1ed0a8 100644 --- a/mysql-test/suite/perfschema/r/pfs_upgrade_func.result +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_func.result @@ -3,62 +3,58 @@ drop function if exists test.user_func; create function test.user_func() returns integer return 0; update mysql.proc set db='performance_schema' where name='user_func'; -Warning: Using a password on the command line interface can be insecure. -Warning: Using a password on the command line interface can be insecure. -Warning: Using a password on the command line interface can be insecure. -ERROR 1050 (42S01) at line 164: Table 'cond_instances' already exists -ERROR 1050 (42S01) at line 189: Table 'events_waits_current' already exists -ERROR 1050 (42S01) at line 214: Table 'events_waits_history' already exists -ERROR 1050 (42S01) at line 239: Table 'events_waits_history_long' already exists -ERROR 1050 (42S01) at line 252: Table 'events_waits_summary_by_instance' already exists -ERROR 1050 (42S01) at line 265: Table 'events_waits_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 278: Table 'events_waits_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 292: Table 'events_waits_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 305: Table 'events_waits_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 317: Table 'events_waits_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 326: Table 'file_instances' already exists -ERROR 1050 (42S01) at line 355: Table 'file_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 386: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 399: Table 'socket_instances' already exists -ERROR 1050 (42S01) at line 429: Table 'socket_summary_by_instance' already exists -ERROR 1050 (42S01) at line 458: Table 'socket_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 493: Table 'host_cache' already exists -ERROR 1050 (42S01) at line 502: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 516: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 526: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 536: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 545: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 553: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 562: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 573: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 581: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 626: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 670: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 749: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 769: Table 'threads' already exists -ERROR 1050 (42S01) at line 785: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 801: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 817: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 830: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 843: Table 'events_stages_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 856: Table 'events_stages_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 870: Table 'events_stages_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 882: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 928: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 974: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 1020: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 1084: Table 'events_statements_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 1149: Table 'events_statements_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 1180: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 1189: Table 'hosts' already exists -ERROR 1050 (42S01) at line 1198: Table 'users' already exists -ERROR 1050 (42S01) at line 1208: Table 'accounts' already exists -ERROR 1050 (42S01) at line 1243: Table 'events_statements_summary_by_digest' already exists -ERROR 1050 (42S01) at line 1253: Table 'session_connect_attrs' already exists -ERROR 1050 (42S01) at line 1259: Table 'session_account_connect_attrs' already exists -ERROR 1644 (HY000) at line 1852: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line ###: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'file_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line ###: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'host_cache' already exists +ERROR 1050 (42S01) at line ###: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line ###: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line ###: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line ###: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line ###: Table 'threads' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'hosts' already exists +ERROR 1050 (42S01) at line ###: Table 'users' already exists +ERROR 1050 (42S01) at line ###: Table 'accounts' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_digest' already exists +ERROR 1050 (42S01) at line ###: Table 'session_connect_attrs' already exists +ERROR 1050 (42S01) at line ###: Table 'session_account_connect_attrs' already exists FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result b/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result index 574061d9b9d..f5a13fb445d 100644 --- a/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result @@ -3,62 +3,58 @@ drop procedure if exists test.user_proc; create procedure test.user_proc() select "Not supposed to be here"; update mysql.proc set db='performance_schema' where name='user_proc'; -Warning: Using a password on the command line interface can be insecure. -Warning: Using a password on the command line interface can be insecure. -Warning: Using a password on the command line interface can be insecure. -ERROR 1050 (42S01) at line 164: Table 'cond_instances' already exists -ERROR 1050 (42S01) at line 189: Table 'events_waits_current' already exists -ERROR 1050 (42S01) at line 214: Table 'events_waits_history' already exists -ERROR 1050 (42S01) at line 239: Table 'events_waits_history_long' already exists -ERROR 1050 (42S01) at line 252: Table 'events_waits_summary_by_instance' already exists -ERROR 1050 (42S01) at line 265: Table 'events_waits_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 278: Table 'events_waits_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 292: Table 'events_waits_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 305: Table 'events_waits_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 317: Table 'events_waits_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 326: Table 'file_instances' already exists -ERROR 1050 (42S01) at line 355: Table 'file_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 386: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 399: Table 'socket_instances' already exists -ERROR 1050 (42S01) at line 429: Table 'socket_summary_by_instance' already exists -ERROR 1050 (42S01) at line 458: Table 'socket_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 493: Table 'host_cache' already exists -ERROR 1050 (42S01) at line 502: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 516: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 526: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 536: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 545: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 553: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 562: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 573: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 581: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 626: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 670: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 749: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 769: Table 'threads' already exists -ERROR 1050 (42S01) at line 785: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 801: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 817: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 830: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 843: Table 'events_stages_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 856: Table 'events_stages_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 870: Table 'events_stages_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 882: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 928: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 974: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 1020: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 1084: Table 'events_statements_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 1149: Table 'events_statements_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 1180: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 1189: Table 'hosts' already exists -ERROR 1050 (42S01) at line 1198: Table 'users' already exists -ERROR 1050 (42S01) at line 1208: Table 'accounts' already exists -ERROR 1050 (42S01) at line 1243: Table 'events_statements_summary_by_digest' already exists -ERROR 1050 (42S01) at line 1253: Table 'session_connect_attrs' already exists -ERROR 1050 (42S01) at line 1259: Table 'session_account_connect_attrs' already exists -ERROR 1644 (HY000) at line 1852: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line ###: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'file_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line ###: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'host_cache' already exists +ERROR 1050 (42S01) at line ###: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line ###: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line ###: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line ###: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line ###: Table 'threads' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'hosts' already exists +ERROR 1050 (42S01) at line ###: Table 'users' already exists +ERROR 1050 (42S01) at line ###: Table 'accounts' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_digest' already exists +ERROR 1050 (42S01) at line ###: Table 'session_connect_attrs' already exists +ERROR 1050 (42S01) at line ###: Table 'session_account_connect_attrs' already exists FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_table.result b/mysql-test/suite/perfschema/r/pfs_upgrade_table.result index 79471353063..bb5ba7060ae 100644 --- a/mysql-test/suite/perfschema/r/pfs_upgrade_table.result +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_table.result @@ -5,62 +5,58 @@ use performance_schema; show tables like "user_table"; Tables_in_performance_schema (user_table) user_table -Warning: Using a password on the command line interface can be insecure. -Warning: Using a password on the command line interface can be insecure. -Warning: Using a password on the command line interface can be insecure. -ERROR 1050 (42S01) at line 164: Table 'cond_instances' already exists -ERROR 1050 (42S01) at line 189: Table 'events_waits_current' already exists -ERROR 1050 (42S01) at line 214: Table 'events_waits_history' already exists -ERROR 1050 (42S01) at line 239: Table 'events_waits_history_long' already exists -ERROR 1050 (42S01) at line 252: Table 'events_waits_summary_by_instance' already exists -ERROR 1050 (42S01) at line 265: Table 'events_waits_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 278: Table 'events_waits_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 292: Table 'events_waits_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 305: Table 'events_waits_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 317: Table 'events_waits_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 326: Table 'file_instances' already exists -ERROR 1050 (42S01) at line 355: Table 'file_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 386: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 399: Table 'socket_instances' already exists -ERROR 1050 (42S01) at line 429: Table 'socket_summary_by_instance' already exists -ERROR 1050 (42S01) at line 458: Table 'socket_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 493: Table 'host_cache' already exists -ERROR 1050 (42S01) at line 502: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 516: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 526: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 536: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 545: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 553: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 562: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 573: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 581: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 626: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 670: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 749: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 769: Table 'threads' already exists -ERROR 1050 (42S01) at line 785: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 801: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 817: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 830: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 843: Table 'events_stages_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 856: Table 'events_stages_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 870: Table 'events_stages_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 882: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 928: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 974: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 1020: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 1084: Table 'events_statements_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 1149: Table 'events_statements_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 1180: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 1189: Table 'hosts' already exists -ERROR 1050 (42S01) at line 1198: Table 'users' already exists -ERROR 1050 (42S01) at line 1208: Table 'accounts' already exists -ERROR 1050 (42S01) at line 1243: Table 'events_statements_summary_by_digest' already exists -ERROR 1050 (42S01) at line 1253: Table 'session_connect_attrs' already exists -ERROR 1050 (42S01) at line 1259: Table 'session_account_connect_attrs' already exists -ERROR 1644 (HY000) at line 1852: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line ###: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'file_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line ###: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'host_cache' already exists +ERROR 1050 (42S01) at line ###: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line ###: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line ###: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line ###: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line ###: Table 'threads' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'hosts' already exists +ERROR 1050 (42S01) at line ###: Table 'users' already exists +ERROR 1050 (42S01) at line ###: Table 'accounts' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_digest' already exists +ERROR 1050 (42S01) at line ###: Table 'session_connect_attrs' already exists +ERROR 1050 (42S01) at line ###: Table 'session_account_connect_attrs' already exists FATAL ERROR: Upgrade failed show tables like "user_table"; Tables_in_performance_schema (user_table) diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_view.result b/mysql-test/suite/perfschema/r/pfs_upgrade_view.result index 90d44087bb0..f9541680b6d 100644 --- a/mysql-test/suite/perfschema/r/pfs_upgrade_view.result +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_view.result @@ -5,62 +5,58 @@ use performance_schema; show tables like "user_view"; Tables_in_performance_schema (user_view) user_view -Warning: Using a password on the command line interface can be insecure. -Warning: Using a password on the command line interface can be insecure. -Warning: Using a password on the command line interface can be insecure. -ERROR 1050 (42S01) at line 164: Table 'cond_instances' already exists -ERROR 1050 (42S01) at line 189: Table 'events_waits_current' already exists -ERROR 1050 (42S01) at line 214: Table 'events_waits_history' already exists -ERROR 1050 (42S01) at line 239: Table 'events_waits_history_long' already exists -ERROR 1050 (42S01) at line 252: Table 'events_waits_summary_by_instance' already exists -ERROR 1050 (42S01) at line 265: Table 'events_waits_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 278: Table 'events_waits_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 292: Table 'events_waits_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 305: Table 'events_waits_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 317: Table 'events_waits_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 326: Table 'file_instances' already exists -ERROR 1050 (42S01) at line 355: Table 'file_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 386: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 399: Table 'socket_instances' already exists -ERROR 1050 (42S01) at line 429: Table 'socket_summary_by_instance' already exists -ERROR 1050 (42S01) at line 458: Table 'socket_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 493: Table 'host_cache' already exists -ERROR 1050 (42S01) at line 502: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 516: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 526: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 536: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 545: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 553: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 562: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 573: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 581: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 626: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 670: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 749: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 769: Table 'threads' already exists -ERROR 1050 (42S01) at line 785: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 801: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 817: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 830: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 843: Table 'events_stages_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 856: Table 'events_stages_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 870: Table 'events_stages_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 882: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 928: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 974: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 1020: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 1084: Table 'events_statements_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 1149: Table 'events_statements_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 1180: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 1189: Table 'hosts' already exists -ERROR 1050 (42S01) at line 1198: Table 'users' already exists -ERROR 1050 (42S01) at line 1208: Table 'accounts' already exists -ERROR 1050 (42S01) at line 1243: Table 'events_statements_summary_by_digest' already exists -ERROR 1050 (42S01) at line 1253: Table 'session_connect_attrs' already exists -ERROR 1050 (42S01) at line 1259: Table 'session_account_connect_attrs' already exists -ERROR 1644 (HY000) at line 1852: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line ###: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'file_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line ###: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'host_cache' already exists +ERROR 1050 (42S01) at line ###: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line ###: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line ###: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line ###: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line ###: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line ###: Table 'threads' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line ###: Table 'hosts' already exists +ERROR 1050 (42S01) at line ###: Table 'users' already exists +ERROR 1050 (42S01) at line ###: Table 'accounts' already exists +ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_digest' already exists +ERROR 1050 (42S01) at line ###: Table 'session_connect_attrs' already exists +ERROR 1050 (42S01) at line ###: Table 'session_account_connect_attrs' already exists FATAL ERROR: Upgrade failed show tables like "user_view"; Tables_in_performance_schema (user_view) diff --git a/mysql-test/suite/perfschema/r/privilege.result b/mysql-test/suite/perfschema/r/privilege.result index f7d0eddfb2d..49d72fc499f 100644 --- a/mysql-test/suite/perfschema/r/privilege.result +++ b/mysql-test/suite/perfschema/r/privilege.result @@ -1,7 +1,7 @@ show grants; Grants for root@localhost GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION -GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION +GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION grant ALL on *.* to 'pfs_user_1'@localhost with GRANT OPTION; grant ALL on performance_schema.* to 'pfs_user_2'@localhost with GRANT OPTION; @@ -152,13 +152,13 @@ before insert on performance_schema.file_instances for each row begin end; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' create table test.t1(a int) engine=PERFORMANCE_SCHEMA; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.setup_instruments; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.events_waits_current; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.file_instances; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") insert into performance_schema.setup_instruments set name="foo"; ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments' @@ -250,13 +250,13 @@ before insert on performance_schema.file_instances for each row begin end; ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' create table test.t1(a int) engine=PERFORMANCE_SCHEMA; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.setup_instruments; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.events_waits_current; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.file_instances; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") insert into performance_schema.setup_instruments set name="foo"; ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments' @@ -348,13 +348,13 @@ before insert on performance_schema.file_instances for each row begin end; ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' create table test.t1(a int) engine=PERFORMANCE_SCHEMA; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.setup_instruments; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.events_waits_current; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.file_instances; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") insert into performance_schema.setup_instruments set name="foo"; ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments' @@ -446,13 +446,13 @@ before insert on performance_schema.file_instances for each row begin end; ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' create table test.t1(a int) engine=PERFORMANCE_SCHEMA; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.setup_instruments; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.events_waits_current; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.file_instances; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") insert into performance_schema.setup_instruments set name="foo"; ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments' diff --git a/mysql-test/suite/perfschema/r/privilege_table_io.result b/mysql-test/suite/perfschema/r/privilege_table_io.result index ffba8643d79..838d17e61fe 100644 --- a/mysql-test/suite/perfschema/r/privilege_table_io.result +++ b/mysql-test/suite/perfschema/r/privilege_table_io.result @@ -46,7 +46,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -92,6 +92,7 @@ where event_name like 'wait/io/table/%' and object_schema in ("test", "mysql") order by thread_id, event_id; event_name short_source object_type object_schema pretty_name operation number_of_bytes +wait/io/table/sql/handler handler.cc: TABLE mysql host fetch NULL wait/io/table/sql/handler handler.cc: TABLE mysql user fetch NULL wait/io/table/sql/handler handler.cc: TABLE mysql user fetch NULL wait/io/table/sql/handler handler.cc: TABLE mysql user fetch NULL @@ -103,6 +104,7 @@ wait/io/table/sql/handler handler.cc: TABLE mysql db fetch NULL wait/io/table/sql/handler handler.cc: TABLE mysql proxies_priv fetch NULL wait/io/table/sql/handler handler.cc: TABLE mysql proxies_priv fetch NULL wait/io/table/sql/handler handler.cc: TABLE mysql proxies_priv fetch NULL +wait/io/table/sql/handler handler.cc: TABLE mysql roles_mapping fetch NULL wait/io/table/sql/handler handler.cc: TABLE mysql tables_priv fetch NULL wait/io/table/sql/handler handler.cc: TABLE mysql procs_priv fetch NULL wait/io/table/sql/handler handler.cc: TABLE mysql servers fetch NULL diff --git a/mysql-test/suite/perfschema/r/relaylog.result b/mysql-test/suite/perfschema/r/relaylog.result index 2b11019799b..beabb968ac8 100644 --- a/mysql-test/suite/perfschema/r/relaylog.result +++ b/mysql-test/suite/perfschema/r/relaylog.result @@ -1,7 +1,4 @@ include/master-slave.inc -Warnings: -Note #### Sending passwords in plain text without SSL/TLS is extremely insecure. -Note #### Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information. [connection master] drop table if exists test.t1; reset master; @@ -9,7 +6,9 @@ create table test.t1(a int); drop table test.t1; include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info +slave-bin.000001 # Gtid # # GTID #-#-# slave-bin.000001 # Query # # use `test`; create table test.t1(a int) +slave-bin.000001 # Gtid # # GTID #-#-# slave-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ "============ Performance schema on master ============" select @@ -23,7 +22,7 @@ from performance_schema.file_summary_by_instance where file_name like "%master-%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE master-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY -master-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE +master-bin.index wait/io/file/sql/binlog_index MANY MANY MANY MANY select * from performance_schema.file_summary_by_instance where file_name like "%slave-%" order by file_name; FILE_NAME EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT COUNT_READ SUM_TIMER_READ MIN_TIMER_READ AVG_TIMER_READ MAX_TIMER_READ SUM_NUMBER_OF_BYTES_READ COUNT_WRITE SUM_TIMER_WRITE MIN_TIMER_WRITE AVG_TIMER_WRITE MAX_TIMER_WRITE SUM_NUMBER_OF_BYTES_WRITE COUNT_MISC SUM_TIMER_MISC MIN_TIMER_MISC AVG_TIMER_MISC MAX_TIMER_MISC @@ -39,7 +38,7 @@ from performance_schema.file_summary_by_instance where event_name like "%binlog%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE master-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY -master-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE +master-bin.index wait/io/file/sql/binlog_index MANY MANY MANY MANY select EVENT_NAME, if (count_read > 0, "MANY", "NONE") as COUNT_READ, @@ -50,26 +49,22 @@ from performance_schema.file_summary_by_event_name where event_name like "%binlog%" order by event_name; EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE wait/io/file/sql/binlog MANY MANY MANY MANY -wait/io/file/sql/binlog_index MANY NONE NONE NONE +wait/io/file/sql/binlog_index MANY MANY MANY MANY +wait/io/file/sql/binlog_state NONE NONE NONE NONE select EVENT_NAME, if (count_star > 0, "MANY", "NONE") as COUNT_STAR from performance_schema.events_waits_summary_global_by_event_name where event_name like "%MYSQL_BIN_LOG%" and event_name not like "%MYSQL_BIN_LOG::update_cond" + and event_name not like "%MYSQL_BIN_LOG::COND_binlog_background_thread%" + and event_name not like "%MYSQL_BIN_LOG::COND_xid_list" order by event_name; EVENT_NAME COUNT_STAR -wait/synch/cond/sql/MYSQL_BIN_LOG::COND_done NONE -wait/synch/cond/sql/MYSQL_BIN_LOG::prep_xids_cond NONE -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit_queue MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_done MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_flush_queue MANY +wait/synch/cond/sql/MYSQL_BIN_LOG::COND_queue_busy NONE +wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_background_thread MANY wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_log MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_sync MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_sync_queue MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_xids NONE +wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_xid_list MANY "Expect no slave relay log" select * from performance_schema.file_summary_by_instance where event_name like "%relaylog%" order by file_name; @@ -84,17 +79,8 @@ where event_name like "%MYSQL_RELAY_LOG%" and event_name not like "%MYSQL_RELAY_LOG::update_cond" order by event_name; EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT -wait/synch/cond/sql/MYSQL_RELAY_LOG::COND_done 0 0 0 0 0 -wait/synch/cond/sql/MYSQL_RELAY_LOG::prep_xids_cond 0 0 0 0 0 -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_commit 0 0 0 0 0 -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_commit_queue 0 0 0 0 0 -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_done 0 0 0 0 0 -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_flush_queue 0 0 0 0 0 +wait/synch/cond/sql/MYSQL_RELAY_LOG::COND_queue_busy 0 0 0 0 0 wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index 0 0 0 0 0 -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_log 0 0 0 0 0 -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_sync 0 0 0 0 0 -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_sync_queue 0 0 0 0 0 -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_xids 0 0 0 0 0 "============ Performance schema on slave ============" select * from performance_schema.file_summary_by_instance where file_name like "%master-%" order by file_name; @@ -114,10 +100,10 @@ where file_name like "%slave-%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE slave-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY -slave-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE +slave-bin.index wait/io/file/sql/binlog_index MANY MANY MANY MANY slave-relay-bin.000001 wait/io/file/sql/relaylog MANY MANY MANY MANY slave-relay-bin.000002 wait/io/file/sql/relaylog MANY MANY MANY MANY -slave-relay-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE +slave-relay-bin.index wait/io/file/sql/relaylog_index MANY MANY MANY MANY "Expect a slave binlog + binlog_index" select substring(file_name, locate("slave-", file_name)) as FILE_NAME, @@ -130,8 +116,7 @@ from performance_schema.file_summary_by_instance where event_name like "%binlog%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE slave-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY -slave-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE -slave-relay-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE +slave-bin.index wait/io/file/sql/binlog_index MANY MANY MANY MANY select EVENT_NAME, if (count_read > 0, "MANY", "NONE") as COUNT_READ, @@ -142,26 +127,22 @@ from performance_schema.file_summary_by_event_name where event_name like "%binlog%" order by event_name; EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE wait/io/file/sql/binlog MANY MANY MANY MANY -wait/io/file/sql/binlog_index MANY NONE MANY NONE +wait/io/file/sql/binlog_index MANY MANY MANY MANY +wait/io/file/sql/binlog_state NONE NONE NONE NONE select EVENT_NAME, if (count_star > 0, "MANY", "NONE") as COUNT_STAR from performance_schema.events_waits_summary_global_by_event_name where event_name like "%MYSQL_BIN_LOG%" and event_name not like "%MYSQL_BIN_LOG::update_cond" + and event_name not like "%MYSQL_BIN_LOG::COND_binlog_background_thread%" + and event_name not like "%MYSQL_BIN_LOG::COND_xid_list" order by event_name; EVENT_NAME COUNT_STAR -wait/synch/cond/sql/MYSQL_BIN_LOG::COND_done NONE -wait/synch/cond/sql/MYSQL_BIN_LOG::prep_xids_cond NONE -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit_queue MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_done MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_flush_queue MANY +wait/synch/cond/sql/MYSQL_BIN_LOG::COND_queue_busy NONE +wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_background_thread MANY wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_log MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_sync MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_sync_queue MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_xids NONE +wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_xid_list MANY "Expect a slave relay log" select substring(file_name, locate("slave-", file_name)) as FILE_NAME, @@ -179,6 +160,7 @@ order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE slave-relay-bin.000001 wait/io/file/sql/relaylog MANY MANY MANY MANY slave-relay-bin.000002 wait/io/file/sql/relaylog MANY MANY MANY MANY +slave-relay-bin.index wait/io/file/sql/relaylog_index MANY MANY MANY MANY select EVENT_NAME, if (count_read > 0, "MANY", "NONE") as COUNT_READ, @@ -189,7 +171,7 @@ from performance_schema.file_summary_by_event_name where event_name like "%relaylog%" order by event_name; EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE wait/io/file/sql/relaylog MANY MANY MANY MANY -wait/io/file/sql/relaylog_index MANY NONE NONE NONE +wait/io/file/sql/relaylog_index MANY MANY MANY MANY select EVENT_NAME, if (count_star > 0, "MANY", "NONE") as COUNT_STAR @@ -198,15 +180,6 @@ where event_name like "%MYSQL_RELAY_LOG%" and event_name not like "%MYSQL_RELAY_LOG::update_cond" order by event_name; EVENT_NAME COUNT_STAR -wait/synch/cond/sql/MYSQL_RELAY_LOG::COND_done NONE -wait/synch/cond/sql/MYSQL_RELAY_LOG::prep_xids_cond NONE -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_commit NONE -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_commit_queue NONE -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_done NONE -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_flush_queue NONE +wait/synch/cond/sql/MYSQL_RELAY_LOG::COND_queue_busy NONE wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index MANY -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_log MANY -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_sync NONE -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_sync_queue NONE -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_xids MANY -include/rpl_end.inc +include/stop_slave.inc diff --git a/mysql-test/suite/perfschema/r/rollback_table_io.result b/mysql-test/suite/perfschema/r/rollback_table_io.result index 50181ecd2d5..f08d11e21d8 100644 --- a/mysql-test/suite/perfschema/r/rollback_table_io.result +++ b/mysql-test/suite/perfschema/r/rollback_table_io.result @@ -7,6 +7,7 @@ t1 CREATE TABLE `t1` ( `col2` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 insert into test.t1 values(1,'One'); +set default_storage_engine=InnoDB; drop table if exists test.marker; create table test.marker(a int); update performance_schema.setup_consumers set enabled='NO'; diff --git a/mysql-test/suite/perfschema/r/rpl_gtid_func.result b/mysql-test/suite/perfschema/r/rpl_gtid_func.result index c7727791eb7..98342bc4869 100644 --- a/mysql-test/suite/perfschema/r/rpl_gtid_func.result +++ b/mysql-test/suite/perfschema/r/rpl_gtid_func.result @@ -1,7 +1,4 @@ include/master-slave.inc -Warnings: -Note #### Sending passwords in plain text without SSL/TLS is extremely insecure. -Note #### Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information. [connection master] **** On Master **** drop table if exists test.marker; @@ -40,7 +37,7 @@ select digest, digest_text, count_star from performance_schema.events_statements_summary_by_digest where digest_text like "%in_%_digest%"; digest digest_text count_star -8d588d616712c7d8dfabf22ce262662b SELECT ? AS in_master_digest 1 +e315485f9cbc06befb4e59970905a034 SELECT ? AS in_master_digest 1 insert into test.marker values (2); **** On Slave **** select * from test.marker; @@ -67,7 +64,7 @@ select digest, digest_text, count_star from performance_schema.events_statements_summary_by_digest where digest_text like "%in_%_digest%"; digest digest_text count_star -02e25175edc3b2834b9b41d58f5a8a6a SELECT ? AS in_slave_digest 1 +bd2f53b41efcd037df41a3dd8bf3312a SELECT ? AS in_slave_digest 1 **** On Master **** delete from performance_schema.setup_objects where object_schema='master'; diff --git a/mysql-test/suite/perfschema/r/rpl_statements.result b/mysql-test/suite/perfschema/r/rpl_statements.result index dd8d349b989..e271cd2a7fa 100644 --- a/mysql-test/suite/perfschema/r/rpl_statements.result +++ b/mysql-test/suite/perfschema/r/rpl_statements.result @@ -1,7 +1,4 @@ include/master-slave.inc -Warnings: -Note #### Sending passwords in plain text without SSL/TLS is extremely insecure. -Note #### Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information. [connection master] # diff --git a/mysql-test/suite/perfschema/r/server_init.result b/mysql-test/suite/perfschema/r/server_init.result index ed267aeb8c2..20dc1309795 100644 --- a/mysql-test/suite/perfschema/r/server_init.result +++ b/mysql-test/suite/perfschema/r/server_init.result @@ -32,17 +32,13 @@ where name like "wait/synch/cond/mysys/THR_COND_threads"; count(name) 1 select count(name) from mutex_instances -where name like "wait/synch/mutex/sql/LOCK_open"; -count(name) -1 -select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_thread_count"; count(name) 1 select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_log_throttle_qni"; count(name) -1 +0 select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_status"; count(name) @@ -58,7 +54,7 @@ count(name) select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_uuid_generator"; count(name) -1 +0 select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_delayed_status"; count(name) @@ -82,7 +78,7 @@ count(name) select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_manager"; count(name) -1 +0 select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_global_system_variables"; count(name) @@ -166,7 +162,7 @@ count(name) select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_manager"; count(name) -1 +0 select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_thread_cache"; count(name) diff --git a/mysql-test/suite/perfschema/r/setup_instruments_defaults.result b/mysql-test/suite/perfschema/r/setup_instruments_defaults.result index 6932d8926c9..e502376b578 100644 --- a/mysql-test/suite/perfschema/r/setup_instruments_defaults.result +++ b/mysql-test/suite/perfschema/r/setup_instruments_defaults.result @@ -12,7 +12,6 @@ ORDER BY name; NAME ENABLED TIMED stage/sql/creating table YES NO wait/synch/mutex/sql/LOCK_user_conn YES NO -wait/synch/mutex/sql/LOCK_uuid_generator YES NO wait/synch/mutex/sql/LOCK_xid_cache YES NO SELECT * FROM performance_schema.setup_instruments WHERE name = 'wait/synch/mutex/sql/LOCK_thread_count' diff --git a/mysql-test/suite/perfschema/r/short_option_1.result b/mysql-test/suite/perfschema/r/short_option_1.result index a64ff442dec..45f7d989d8e 100644 --- a/mysql-test/suite/perfschema/r/short_option_1.result +++ b/mysql-test/suite/perfschema/r/short_option_1.result @@ -13,14 +13,11 @@ utf8 show variables like 'character_set_system'; Variable_name Value character_set_system utf8 -show variables like 'log'; -Variable_name Value show variables like 'general_log'; Variable_name Value general_log ON show variables like 'new'; Variable_name Value -new ON show variables like 'log_warnings'; Variable_name Value log_warnings 3 diff --git a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result index a273bbde92c..d725009d8fd 100644 --- a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result +++ b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result @@ -59,7 +59,7 @@ ERROR 42S02: Table 'mysqltest.does_not_exist' doesn't exist # The statement has the same length like in 3.2 but the error # message is now different and much longer. SELECT col2 FROM does_not_exist WHERE col1 A 0; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'A 0' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'A 0' at line 1 # 3.4 SELECT ending with server sending an error message. # Statement and error message are a bit longer than in 3.1 # because the table name is longer. diff --git a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result index 2bdc2524bbc..2c5a9e9284f 100644 --- a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result +++ b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result @@ -59,7 +59,7 @@ ERROR 42S02: Table 'mysqltest.does_not_exist' doesn't exist # The statement has the same length like in 3.2 but the error # message is now different and much longer. SELECT col2 FROM does_not_exist WHERE col1 A 0; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'A 0' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'A 0' at line 1 # 3.4 SELECT ending with server sending an error message. # Statement and error message are a bit longer than in 3.1 # because the table name is longer. diff --git a/mysql-test/suite/perfschema/r/stage_mdl_function.result b/mysql-test/suite/perfschema/r/stage_mdl_function.result index 456afd3f4c1..39cf2b08e85 100644 --- a/mysql-test/suite/perfschema/r/stage_mdl_function.result +++ b/mysql-test/suite/perfschema/r/stage_mdl_function.result @@ -11,8 +11,8 @@ username event_name sql_text user1 statement/sql/select select test.f1() username event_name nesting_event_type username event_name nesting_event_type -user1 stage/sql/init STATEMENT user1 stage/sql/System lock STATEMENT +user1 stage/sql/init STATEMENT user1 stage/sql/optimizing STATEMENT user1 stage/sql/executing STATEMENT user1 stage/sql/Opening tables STATEMENT diff --git a/mysql-test/suite/perfschema/r/stage_mdl_global.result b/mysql-test/suite/perfschema/r/stage_mdl_global.result index de5df8f189a..1a6f51a4acc 100644 --- a/mysql-test/suite/perfschema/r/stage_mdl_global.result +++ b/mysql-test/suite/perfschema/r/stage_mdl_global.result @@ -6,8 +6,6 @@ user1 statement/sql/flush flush tables with read lock username event_name nesting_event_type username event_name nesting_event_type user1 stage/sql/init STATEMENT -user1 stage/sql/Waiting for query cache lock STATEMENT -user1 stage/sql/init STATEMENT user1 stage/sql/query end STATEMENT user1 stage/sql/closing tables STATEMENT user1 stage/sql/freeing items STATEMENT diff --git a/mysql-test/suite/perfschema/r/start_server_disable_idle.result b/mysql-test/suite/perfschema/r/start_server_disable_idle.result index 9f22ca75162..b27ecd52226 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_idle.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_idle.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_disable_stages.result b/mysql-test/suite/perfschema/r/start_server_disable_stages.result index d73d7920cd7..0b8e00a5653 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_stages.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_stages.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_disable_statements.result b/mysql-test/suite/perfschema/r/start_server_disable_statements.result index af5fbb00d15..8e8d1498b9f 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_statements.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_statements.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_disable_waits.result b/mysql-test/suite/perfschema/r/start_server_disable_waits.result index 92f50e0a699..d4b02dedc2c 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_waits.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_waits.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_innodb.result b/mysql-test/suite/perfschema/r/start_server_innodb.result index ac5d03945c2..0d7ea7d6294 100644 --- a/mysql-test/suite/perfschema/r/start_server_innodb.result +++ b/mysql-test/suite/perfschema/r/start_server_innodb.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_account.result b/mysql-test/suite/perfschema/r/start_server_no_account.result index d45e9a77910..b9ec719ed58 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_account.result +++ b/mysql-test/suite/perfschema/r/start_server_no_account.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result index fb7eb60c915..4fac77bc0cc 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result index 3fa4ed1a43d..75cd54776eb 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_class.result b/mysql-test/suite/perfschema/r/start_server_no_file_class.result index 6079cb7fbdf..9922fcaa016 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_file_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result index 786c8a6cb96..6e8735f6a1f 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_host.result b/mysql-test/suite/perfschema/r/start_server_no_host.result index 26b736922fe..f5dae7c61d9 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_host.result +++ b/mysql-test/suite/perfschema/r/start_server_no_host.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result index 77210f4253f..4b3c8790b58 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result index ca2ce3114c9..92ec4cf61fc 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result index 252c6c7f0aa..e4ac0d0fa8b 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result index e7655a314ea..3bba543f3b8 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 0 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result index 48c0574912f..2c3ef382fb9 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result +++ b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result index aecc8fa1bd0..0b49b4d055a 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result +++ b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result index d247a9b148d..9cf73c2b78d 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 0 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result index 6682121bd99..6da66d6ee75 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 0 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result index 41275012bfa..532935bb0ff 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 0 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result index 0e367945cfc..360571bc326 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result index aa3de1ab7cd..d458e3da9b1 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result index d890992ac83..2682ea22f88 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result index 62b3290d7ed..9568e9ad56b 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result index 0e5837c9eaf..c189d9a5024 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result +++ b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 0 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result index 72347f14160..a440cfe3302 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 0 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result index e5dd500c316..d9c945ea8cb 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 0 diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result index d36c2b30441..f5ce5bebb51 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_user.result b/mysql-test/suite/perfschema/r/start_server_no_user.result index 89efe84d938..53cb0051f97 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_user.result +++ b/mysql-test/suite/perfschema/r/start_server_no_user.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result index 81e999bc0ee..125274550eb 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result index bca3594c225..50212863574 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_off.result b/mysql-test/suite/perfschema/r/start_server_off.result index f5249dc2039..08847829579 100644 --- a/mysql-test/suite/perfschema/r/start_server_off.result +++ b/mysql-test/suite/perfschema/r/start_server_off.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_on.result b/mysql-test/suite/perfschema/r/start_server_on.result index ac5d03945c2..0d7ea7d6294 100644 --- a/mysql-test/suite/perfschema/r/start_server_on.result +++ b/mysql-test/suite/perfschema/r/start_server_on.result @@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/statement_digest.result b/mysql-test/suite/perfschema/r/statement_digest.result index 699add920d2..41cba435cb6 100644 --- a/mysql-test/suite/perfschema/r/statement_digest.result +++ b/mysql-test/suite/perfschema/r/statement_digest.result @@ -112,43 +112,43 @@ DROP TRIGGER trg; SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS -statements_digest e4a84a547a18a89f4708509a720def58 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 -statements_digest ab105aea9c15b3842ad161d18349f9c4 SELECT ? FROM t1 1 0 0 0 -statements_digest 835083efbaa5d8c29d01d558abb8216b SELECT ? FROM `t1` 1 0 0 0 -statements_digest 6ff375c6f4b283de91711a78bd91b953 SELECT ?, ... FROM t1 2 0 0 0 -statements_digest 4879fbad051c94ff76e6ad29effa4903 SELECT ? FROM t2 1 0 0 0 -statements_digest b1ea4bca7c91ebd647b6b81e80a2ef94 SELECT ?, ... FROM t2 2 0 0 0 -statements_digest 14d463345df747d42a036019a5988a9b INSERT INTO t1 VALUES (?) 1 1 0 0 -statements_digest ff2d8aa1fd516f5e25b0faf7b1c80b04 INSERT INTO t2 VALUES (?) 1 1 0 0 -statements_digest 430116339c3a5bf0a1aa9a96e9cfd354 INSERT INTO t3 VALUES (...) 4 4 0 0 -statements_digest 01467137a1045e85119538ea248d52dd INSERT INTO t4 VALUES (...) 1 1 0 0 -statements_digest b201a20a2a534d2789750270b7f90fab INSERT INTO t5 VALUES (...) 1 1 0 0 -statements_digest b1a5f24770580f243ad6704590165d90 INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0 -statements_digest bbbf619ec8ca4ec4a4da28a71eb12a2f INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0 -statements_digest de7bdb298875f4ef826383e3fce53ef9 INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0 -statements_digest f79cdc2ddca01e9ea89782b3548b01e3 INSERT INTO t1 VALUES ( NULL ) 1 1 0 0 -statements_digest cd4a3e419e2eaed79f66a705ff002910 INSERT INTO t6 VALUES (...) 5 5 0 0 -statements_digest f2d57cea9e78e7b37c4509c0564dd1cc SELECT ? + ? 3 0 0 0 -statements_digest 02396199eed2345830efcf00e51107ee SELECT ? 1 0 0 0 -statements_digest 7c5b403e11cb8fa41954f8b81d47fb44 CREATE SCHEMA statements_digest_temp 2 2 0 0 -statements_digest d5c2a9eedc964698407667a633301e69 DROP SCHEMA statements_digest_temp 2 0 0 0 -statements_digest add5619cd2761d01c66b68b50a4c0476 SELECT ? FROM no_such_table 1 0 0 1 -statements_digest f59e7a7dbcdc342b7ea72ae24e5ef081 CREATE TABLE dup_table ( c CHARACTER (?) ) 2 0 0 1 -statements_digest b42311b2b180ba680ebb286f671982f1 DROP TABLE dup_table 1 0 0 0 -statements_digest 8af43d157243ebdc9dcb1a9502acdd24 INSERT INTO t11 VALUES (?) 1 1 1 0 -statements_digest cee5b131782212e0ba1cd76ba28485c4 SHOW WARNINGS 1 0 0 0 -statements_digest 438623439c3a1702203d6190795127ad PREPARE stmt FROM ? 1 0 0 0 -statements_digest e53b71815168ad954fd921a6ae1860c9 EXECUTE stmt 2 0 0 0 -statements_digest 3bccf5096186ceaf50c11c3deb4e21cf DEALLOCATE PREPARE stmt 1 0 0 0 -statements_digest e20f8d5cb15105439af39592b79c0edd CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 1 0 0 0 -statements_digest 10298a45c9f7114e4985de53ca99bda7 CALL p1 ( ) 2 0 0 0 -statements_digest efc046c5d04acb8afa61326f759ad380 DROP PROCEDURE p1 1 0 0 0 -statements_digest 8eaf9e776b79f24f2b8fae8efb92d8a4 CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 1 0 0 0 -statements_digest b364c71d8c904eb9e95df4d0ca258c00 SELECT func (...) 2 0 0 0 -statements_digest 88e7ac9784e4561d12fadccde6ea704a DROP FUNCTION func 1 0 0 0 -statements_digest 15deeaae5594a691cf21abd4439ee5e6 CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @ ? := ? 1 0 0 0 -statements_digest 074e38814943a6dce874784d21fea89d INSERT INTO t12 VALUES (?) 2 2 0 0 -statements_digest 2b5b02ba54b27638d5d8dbe917ff432d DROP TRIGGER trg 1 0 0 0 +statements_digest 0e98ee6a98e296530ec59c12dbc08dfe TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 +statements_digest 954f43425c3234acc8e194afd97e8a0a SELECT ? FROM t1 1 0 0 0 +statements_digest fc365a54bc19d746bd24c27aba46b990 SELECT ? FROM `t1` 1 0 0 0 +statements_digest 27ba28f6252e4ae0e9b14b36da536fbe SELECT ?, ... FROM t1 2 0 0 0 +statements_digest 81d03922612900032ec4b81934ab4841 SELECT ? FROM t2 1 0 0 0 +statements_digest adce8aec12b6b5046cd4bf55951014c7 SELECT ?, ... FROM t2 2 0 0 0 +statements_digest 59a1bd93c424b10802fe66bb6dcd94d2 INSERT INTO t1 VALUES (?) 1 1 0 0 +statements_digest 91b2da58b0eb49c35a38fbc49f5e491d INSERT INTO t2 VALUES (?) 1 1 0 0 +statements_digest 967114adbf91d8a4a99ec5e49e909ff4 INSERT INTO t3 VALUES (...) 4 4 0 0 +statements_digest 8f25e7a48487e0aa7377e816816bb658 INSERT INTO t4 VALUES (...) 1 1 0 0 +statements_digest 4e51253af793867fba66166de1f314f7 INSERT INTO t5 VALUES (...) 1 1 0 0 +statements_digest fa47b3109e117216cd10209690d28596 INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0 +statements_digest 72409f84bc236e6fe9f2f7b4d727f2d3 INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0 +statements_digest d40aaddb41ed794d65dd8273f0c75700 INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0 +statements_digest 57a82b28388e52e99fc64339dd30edde INSERT INTO t1 VALUES ( NULL ) 1 1 0 0 +statements_digest 6a56b694106442474cb0e5fb7575c8b9 INSERT INTO t6 VALUES (...) 5 5 0 0 +statements_digest c9abf55e296c4317dbaf2d14ef907ad7 SELECT ? + ? 3 0 0 0 +statements_digest 156304a0851a3e3626b39fb3da841a82 SELECT ? 1 0 0 0 +statements_digest 3b085ab0d2063dfca1a39212e3ea1831 CREATE SCHEMA statements_digest_temp 2 2 0 0 +statements_digest 09f9fabef2feb9a54ba01455e5ae83b9 DROP SCHEMA statements_digest_temp 2 0 0 0 +statements_digest 7910a63ffd31cbcb742e15270c8958c8 SELECT ? FROM no_such_table 1 0 0 1 +statements_digest fa34540a438bc672478b1162505ee28c CREATE TABLE dup_table ( c CHARACTER (?) ) 2 0 0 1 +statements_digest 2c720f176bb7c8510ff8aca8921b9945 DROP TABLE dup_table 1 0 0 0 +statements_digest 0c7d9fd8c27ab067511da41ca3bcdff3 INSERT INTO t11 VALUES (?) 1 1 1 0 +statements_digest 81681ff345065ed72bcd1e9407ab85e4 SHOW WARNINGS 1 0 0 0 +statements_digest d766f5823ae5d8e4cf4602b8e7a3fb80 PREPARE stmt FROM ? 1 0 0 0 +statements_digest 3ab1e87eabd9688edf919754cce6348b EXECUTE stmt 2 0 0 0 +statements_digest 470094469d250b9f45cab45bf610efe8 DEALLOCATE PREPARE stmt 1 0 0 0 +statements_digest 1b4d25358e08b35ad54e49dfe5eaf3e4 CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 1 0 0 0 +statements_digest 84554971243e91106214dcb8f4eaa89b CALL p1 ( ) 2 0 0 0 +statements_digest 77206e4bf30979c56752a7ed9150213a DROP PROCEDURE p1 1 0 0 0 +statements_digest 03b91dcdba6b0e29f7fb240ae4bcd97f CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 1 0 0 0 +statements_digest 72bc532f308f2dca62f5291df8c50e6f SELECT func (...) 2 0 0 0 +statements_digest 0b5a5297689c5036def6af8e8a8ce113 DROP FUNCTION func 1 0 0 0 +statements_digest d08331e42c67555ece50e46eef0f2b47 CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @ ? := ? 1 0 0 0 +statements_digest 754a49a4de995c5a729e9ab52f135f59 INSERT INTO t12 VALUES (?) 2 2 0 0 +statements_digest 68df17752bca7c2c8ee2a6a19a0674e7 DROP TRIGGER trg 1 0 0 0 #################################### # CLEANUP #################################### diff --git a/mysql-test/suite/perfschema/r/statement_digest_consumers.result b/mysql-test/suite/perfschema/r/statement_digest_consumers.result index 3f5b730510b..21e62e13b19 100644 --- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result +++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result @@ -125,43 +125,43 @@ DROP TRIGGER trg; #################################### SELECT schema_name, digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest; schema_name digest digest_text count_star -statements_digest e4a84a547a18a89f4708509a720def58 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 -statements_digest ab105aea9c15b3842ad161d18349f9c4 SELECT ? FROM t1 1 -statements_digest 835083efbaa5d8c29d01d558abb8216b SELECT ? FROM `t1` 1 -statements_digest 6ff375c6f4b283de91711a78bd91b953 SELECT ?, ... FROM t1 2 -statements_digest 4879fbad051c94ff76e6ad29effa4903 SELECT ? FROM t2 1 -statements_digest b1ea4bca7c91ebd647b6b81e80a2ef94 SELECT ?, ... FROM t2 2 -statements_digest 14d463345df747d42a036019a5988a9b INSERT INTO t1 VALUES (?) 1 -statements_digest ff2d8aa1fd516f5e25b0faf7b1c80b04 INSERT INTO t2 VALUES (?) 1 -statements_digest 430116339c3a5bf0a1aa9a96e9cfd354 INSERT INTO t3 VALUES (...) 4 -statements_digest 01467137a1045e85119538ea248d52dd INSERT INTO t4 VALUES (...) 1 -statements_digest b201a20a2a534d2789750270b7f90fab INSERT INTO t5 VALUES (...) 1 -statements_digest b1a5f24770580f243ad6704590165d90 INSERT INTO t1 VALUES (?) /* , ... */ 2 -statements_digest bbbf619ec8ca4ec4a4da28a71eb12a2f INSERT INTO t3 VALUES (...) /* , ... */ 1 -statements_digest de7bdb298875f4ef826383e3fce53ef9 INSERT INTO t5 VALUES (...) /* , ... */ 1 -statements_digest f79cdc2ddca01e9ea89782b3548b01e3 INSERT INTO t1 VALUES ( NULL ) 1 -statements_digest cd4a3e419e2eaed79f66a705ff002910 INSERT INTO t6 VALUES (...) 5 -statements_digest f2d57cea9e78e7b37c4509c0564dd1cc SELECT ? + ? 3 -statements_digest 02396199eed2345830efcf00e51107ee SELECT ? 1 -statements_digest 7c5b403e11cb8fa41954f8b81d47fb44 CREATE SCHEMA statements_digest_temp 2 -statements_digest d5c2a9eedc964698407667a633301e69 DROP SCHEMA statements_digest_temp 2 -statements_digest add5619cd2761d01c66b68b50a4c0476 SELECT ? FROM no_such_table 1 -statements_digest f59e7a7dbcdc342b7ea72ae24e5ef081 CREATE TABLE dup_table ( c CHARACTER (?) ) 2 -statements_digest b42311b2b180ba680ebb286f671982f1 DROP TABLE dup_table 1 -statements_digest 8af43d157243ebdc9dcb1a9502acdd24 INSERT INTO t11 VALUES (?) 1 -statements_digest cee5b131782212e0ba1cd76ba28485c4 SHOW WARNINGS 1 -statements_digest 438623439c3a1702203d6190795127ad PREPARE stmt FROM ? 1 -statements_digest e53b71815168ad954fd921a6ae1860c9 EXECUTE stmt 2 -statements_digest 3bccf5096186ceaf50c11c3deb4e21cf DEALLOCATE PREPARE stmt 1 -statements_digest e20f8d5cb15105439af39592b79c0edd CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 1 -statements_digest 10298a45c9f7114e4985de53ca99bda7 CALL p1 ( ) 2 -statements_digest efc046c5d04acb8afa61326f759ad380 DROP PROCEDURE p1 1 -statements_digest 8eaf9e776b79f24f2b8fae8efb92d8a4 CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 1 -statements_digest b364c71d8c904eb9e95df4d0ca258c00 SELECT func (...) 2 -statements_digest 88e7ac9784e4561d12fadccde6ea704a DROP FUNCTION func 1 -statements_digest 15deeaae5594a691cf21abd4439ee5e6 CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @ ? := ? 1 -statements_digest 074e38814943a6dce874784d21fea89d INSERT INTO t12 VALUES (?) 2 -statements_digest 2b5b02ba54b27638d5d8dbe917ff432d DROP TRIGGER trg 1 +statements_digest 0e98ee6a98e296530ec59c12dbc08dfe TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 +statements_digest 954f43425c3234acc8e194afd97e8a0a SELECT ? FROM t1 1 +statements_digest fc365a54bc19d746bd24c27aba46b990 SELECT ? FROM `t1` 1 +statements_digest 27ba28f6252e4ae0e9b14b36da536fbe SELECT ?, ... FROM t1 2 +statements_digest 81d03922612900032ec4b81934ab4841 SELECT ? FROM t2 1 +statements_digest adce8aec12b6b5046cd4bf55951014c7 SELECT ?, ... FROM t2 2 +statements_digest 59a1bd93c424b10802fe66bb6dcd94d2 INSERT INTO t1 VALUES (?) 1 +statements_digest 91b2da58b0eb49c35a38fbc49f5e491d INSERT INTO t2 VALUES (?) 1 +statements_digest 967114adbf91d8a4a99ec5e49e909ff4 INSERT INTO t3 VALUES (...) 4 +statements_digest 8f25e7a48487e0aa7377e816816bb658 INSERT INTO t4 VALUES (...) 1 +statements_digest 4e51253af793867fba66166de1f314f7 INSERT INTO t5 VALUES (...) 1 +statements_digest fa47b3109e117216cd10209690d28596 INSERT INTO t1 VALUES (?) /* , ... */ 2 +statements_digest 72409f84bc236e6fe9f2f7b4d727f2d3 INSERT INTO t3 VALUES (...) /* , ... */ 1 +statements_digest d40aaddb41ed794d65dd8273f0c75700 INSERT INTO t5 VALUES (...) /* , ... */ 1 +statements_digest 57a82b28388e52e99fc64339dd30edde INSERT INTO t1 VALUES ( NULL ) 1 +statements_digest 6a56b694106442474cb0e5fb7575c8b9 INSERT INTO t6 VALUES (...) 5 +statements_digest c9abf55e296c4317dbaf2d14ef907ad7 SELECT ? + ? 3 +statements_digest 156304a0851a3e3626b39fb3da841a82 SELECT ? 1 +statements_digest 3b085ab0d2063dfca1a39212e3ea1831 CREATE SCHEMA statements_digest_temp 2 +statements_digest 09f9fabef2feb9a54ba01455e5ae83b9 DROP SCHEMA statements_digest_temp 2 +statements_digest 7910a63ffd31cbcb742e15270c8958c8 SELECT ? FROM no_such_table 1 +statements_digest fa34540a438bc672478b1162505ee28c CREATE TABLE dup_table ( c CHARACTER (?) ) 2 +statements_digest 2c720f176bb7c8510ff8aca8921b9945 DROP TABLE dup_table 1 +statements_digest 0c7d9fd8c27ab067511da41ca3bcdff3 INSERT INTO t11 VALUES (?) 1 +statements_digest 81681ff345065ed72bcd1e9407ab85e4 SHOW WARNINGS 1 +statements_digest d766f5823ae5d8e4cf4602b8e7a3fb80 PREPARE stmt FROM ? 1 +statements_digest 3ab1e87eabd9688edf919754cce6348b EXECUTE stmt 2 +statements_digest 470094469d250b9f45cab45bf610efe8 DEALLOCATE PREPARE stmt 1 +statements_digest 1b4d25358e08b35ad54e49dfe5eaf3e4 CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 1 +statements_digest 84554971243e91106214dcb8f4eaa89b CALL p1 ( ) 2 +statements_digest 77206e4bf30979c56752a7ed9150213a DROP PROCEDURE p1 1 +statements_digest 03b91dcdba6b0e29f7fb240ae4bcd97f CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 1 +statements_digest 72bc532f308f2dca62f5291df8c50e6f SELECT func (...) 2 +statements_digest 0b5a5297689c5036def6af8e8a8ce113 DROP FUNCTION func 1 +statements_digest d08331e42c67555ece50e46eef0f2b47 CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @ ? := ? 1 +statements_digest 754a49a4de995c5a729e9ab52f135f59 INSERT INTO t12 VALUES (?) 2 +statements_digest 68df17752bca7c2c8ee2a6a19a0674e7 DROP TRIGGER trg 1 SELECT digest, digest_text FROM performance_schema.events_statements_current; digest digest_text #################################### diff --git a/mysql-test/suite/perfschema/r/statement_digest_long_query.result b/mysql-test/suite/perfschema/r/statement_digest_long_query.result index 9dee9dd481b..bb355304537 100644 --- a/mysql-test/suite/perfschema/r/statement_digest_long_query.result +++ b/mysql-test/suite/perfschema/r/statement_digest_long_query.result @@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1 #################################### SELECT schema_name, digest, digest_text, count_star FROM events_statements_summary_by_digest; schema_name digest digest_text count_star -performance_schema e8d937c7ecf79e105de0f9e364fa5edb TRUNCATE TABLE events_statements_summary_by_digest 1 -performance_schema 5d9a2f95653d8ca9d9cea3eefff7e361 SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ... 1 +performance_schema 9d35ff74210c6b30efa4559d627ed0f7 TRUNCATE TABLE events_statements_summary_by_digest 1 +performance_schema d78a04c1c42765b8552e0483c50ae9ff SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ... 1 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 e59a03324dd..ea2980e5755 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 @@ -63,7 +63,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -268,13 +268,13 @@ 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 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 24 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -288,7 +288,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -298,7 +298,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 0 TABLE test t3 31 select concat(current_user(), " is connected") as status; @@ -334,13 +334,13 @@ 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 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 24 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -354,7 +354,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -364,7 +364,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 0 TABLE test t3 31 insert into test.t1 set a=201, b=1, c=1; @@ -436,13 +436,13 @@ 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 62 +wait/io/table/sql/handler 64 wait/lock/table/sql/handler 48 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -456,7 +456,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +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 execute dump_waits_table_lock; @@ -466,7 +466,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 38 +TABLE test t1 40 TABLE test t2 0 TABLE test t3 72 select concat(current_user(), " is connected") as status; @@ -507,13 +507,13 @@ 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 62 +wait/io/table/sql/handler 64 wait/lock/table/sql/handler 48 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -527,7 +527,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +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 execute dump_waits_table_lock; @@ -537,7 +537,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 38 +TABLE test t1 40 TABLE test t2 0 TABLE test t3 72 insert into test.t1 set a=301, b=1, c=1; @@ -621,13 +621,13 @@ 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 114 +wait/io/table/sql/handler 116 wait/lock/table/sql/handler 72 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -641,7 +641,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +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 execute dump_waits_table_lock; @@ -651,7 +651,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 63 +TABLE test t1 65 TABLE test t2 0 TABLE test t3 123 select concat(current_user(), " is connected") as status; @@ -697,13 +697,13 @@ 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 114 +wait/io/table/sql/handler 116 wait/lock/table/sql/handler 72 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -717,7 +717,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +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 execute dump_waits_table_lock; @@ -727,7 +727,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 63 +TABLE test t1 65 TABLE test t2 0 TABLE test t3 123 insert into test.t1 set a=401, b=1, c=1; @@ -823,13 +823,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 96 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -843,7 +843,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -853,7 +853,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 91 +TABLE test t1 93 TABLE test t2 0 TABLE test t3 184 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -901,13 +901,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -921,7 +921,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -931,7 +931,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 flush tables; @@ -976,13 +976,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -996,7 +996,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1006,7 +1006,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 set global read_only=1; @@ -1052,13 +1052,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1072,7 +1072,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1082,7 +1082,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 "================== con1 disconnected ==================" @@ -1125,13 +1125,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1145,7 +1145,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1155,7 +1155,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 "================== con2 disconnected ==================" @@ -1197,13 +1197,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1217,7 +1217,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1227,7 +1227,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 "================== con3 disconnected ==================" @@ -1268,13 +1268,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1288,7 +1288,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1298,7 +1298,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 "================== con4 disconnected ==================" @@ -1338,13 +1338,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1358,7 +1358,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1368,7 +1368,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1409,13 +1409,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1429,7 +1429,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1439,7 +1439,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1480,13 +1480,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1500,7 +1500,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1510,7 +1510,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1551,13 +1551,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1571,7 +1571,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1581,7 +1581,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1622,13 +1622,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1642,7 +1642,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1652,7 +1652,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_global_by_event_name; diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result index bb1fc975cd9..f51e8383019 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -267,13 +267,13 @@ 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 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -287,7 +287,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -297,7 +297,7 @@ TABLE test t2 12 4 8 2 0 0 0 2 0 0 4 TABLE test t3 14 4 10 2 0 0 0 2 0 0 5 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 24 TABLE test t3 31 select concat(current_user(), " is connected") as status; @@ -333,13 +333,13 @@ 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 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -353,7 +353,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -363,7 +363,7 @@ TABLE test t2 12 4 8 2 0 0 0 2 0 0 4 TABLE test t3 14 4 10 2 0 0 0 2 0 0 5 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 24 TABLE test t3 31 insert into test.t1 set a=201, b=1, c=1; @@ -435,13 +435,13 @@ 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 92 +wait/io/table/sql/handler 94 wait/lock/table/sql/handler 72 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -455,7 +455,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +TABLE test t1 20 13 7 13 2 5 0 TABLE test t2 30 20 10 20 4 6 0 TABLE test t3 44 29 15 29 6 9 0 execute dump_waits_table_lock; @@ -465,7 +465,7 @@ TABLE test t2 24 8 16 4 0 0 0 4 0 0 8 TABLE test t3 28 8 20 4 0 0 0 4 0 0 10 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 38 +TABLE test t1 40 TABLE test t2 54 TABLE test t3 72 select concat(current_user(), " is connected") as status; @@ -506,13 +506,13 @@ 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 92 +wait/io/table/sql/handler 94 wait/lock/table/sql/handler 72 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -526,7 +526,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +TABLE test t1 20 13 7 13 2 5 0 TABLE test t2 30 20 10 20 4 6 0 TABLE test t3 44 29 15 29 6 9 0 execute dump_waits_table_lock; @@ -536,7 +536,7 @@ TABLE test t2 24 8 16 4 0 0 0 4 0 0 8 TABLE test t3 28 8 20 4 0 0 0 4 0 0 10 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 38 +TABLE test t1 40 TABLE test t2 54 TABLE test t3 72 insert into test.t1 set a=301, b=1, c=1; @@ -620,13 +620,13 @@ 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 168 +wait/io/table/sql/handler 170 wait/lock/table/sql/handler 108 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -640,7 +640,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +TABLE test t1 35 23 12 23 3 9 0 TABLE test t2 54 36 18 36 6 12 0 TABLE test t3 81 54 27 54 9 18 0 execute dump_waits_table_lock; @@ -650,7 +650,7 @@ TABLE test t2 36 12 24 6 0 0 0 6 0 0 12 TABLE test t3 42 12 30 6 0 0 0 6 0 0 15 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 63 +TABLE test t1 65 TABLE test t2 90 TABLE test t3 123 select concat(current_user(), " is connected") as status; @@ -696,13 +696,13 @@ 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 168 +wait/io/table/sql/handler 170 wait/lock/table/sql/handler 108 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -716,7 +716,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +TABLE test t1 35 23 12 23 3 9 0 TABLE test t2 54 36 18 36 6 12 0 TABLE test t3 81 54 27 54 9 18 0 execute dump_waits_table_lock; @@ -726,7 +726,7 @@ TABLE test t2 36 12 24 6 0 0 0 6 0 0 12 TABLE test t3 42 12 30 6 0 0 0 6 0 0 15 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 63 +TABLE test t1 65 TABLE test t2 90 TABLE test t3 123 insert into test.t1 set a=401, b=1, c=1; @@ -822,13 +822,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 144 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -842,7 +842,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -852,7 +852,7 @@ TABLE test t2 48 16 32 8 0 0 0 8 0 0 16 TABLE test t3 56 16 40 8 0 0 0 8 0 0 20 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 91 +TABLE test t1 93 TABLE test t2 132 TABLE test t3 184 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -900,13 +900,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -920,7 +920,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -930,7 +930,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 flush tables; @@ -975,13 +975,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -995,7 +995,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1005,7 +1005,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 set global read_only=1; @@ -1051,13 +1051,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1071,7 +1071,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1081,7 +1081,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 "================== con1 disconnected ==================" @@ -1124,13 +1124,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1144,7 +1144,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1154,7 +1154,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 "================== con2 disconnected ==================" @@ -1196,13 +1196,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1216,7 +1216,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1226,7 +1226,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 "================== con3 disconnected ==================" @@ -1267,13 +1267,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1287,7 +1287,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1297,7 +1297,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 "================== con4 disconnected ==================" @@ -1337,13 +1337,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1357,7 +1357,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1367,7 +1367,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1408,13 +1408,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1428,7 +1428,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1438,7 +1438,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1479,13 +1479,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1499,7 +1499,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1509,7 +1509,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1550,13 +1550,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1570,7 +1570,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1580,7 +1580,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1621,13 +1621,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1641,7 +1641,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1651,7 +1651,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_global_by_event_name; diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result index ae067698e2d..a7844b6b0e6 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result @@ -63,7 +63,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -268,13 +268,13 @@ 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 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 24 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -288,7 +288,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -298,7 +298,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 0 TABLE test t3 31 select concat(current_user(), " is connected") as status; @@ -334,13 +334,13 @@ 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 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 24 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -354,7 +354,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -364,7 +364,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 0 TABLE test t3 31 insert into test.t1 set a=201, b=1, c=1; @@ -436,13 +436,13 @@ 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 62 +wait/io/table/sql/handler 64 wait/lock/table/sql/handler 48 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -456,7 +456,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +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 execute dump_waits_table_lock; @@ -466,7 +466,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 38 +TABLE test t1 40 TABLE test t2 0 TABLE test t3 72 select concat(current_user(), " is connected") as status; @@ -507,13 +507,13 @@ 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 62 +wait/io/table/sql/handler 64 wait/lock/table/sql/handler 48 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -527,7 +527,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +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 execute dump_waits_table_lock; @@ -537,7 +537,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 38 +TABLE test t1 40 TABLE test t2 0 TABLE test t3 72 insert into test.t1 set a=301, b=1, c=1; @@ -621,13 +621,13 @@ 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 114 +wait/io/table/sql/handler 116 wait/lock/table/sql/handler 72 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -641,7 +641,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +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 execute dump_waits_table_lock; @@ -651,7 +651,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 63 +TABLE test t1 65 TABLE test t2 0 TABLE test t3 123 select concat(current_user(), " is connected") as status; @@ -697,13 +697,13 @@ 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 114 +wait/io/table/sql/handler 116 wait/lock/table/sql/handler 72 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -717,7 +717,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +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 execute dump_waits_table_lock; @@ -727,7 +727,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 63 +TABLE test t1 65 TABLE test t2 0 TABLE test t3 123 insert into test.t1 set a=401, b=1, c=1; @@ -823,13 +823,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 96 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -843,7 +843,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -853,7 +853,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 91 +TABLE test t1 93 TABLE test t2 0 TABLE test t3 184 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -901,13 +901,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -921,7 +921,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -931,7 +931,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 flush tables; @@ -976,13 +976,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -996,7 +996,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1006,7 +1006,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 set global read_only=1; @@ -1052,13 +1052,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1072,7 +1072,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1082,7 +1082,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 "================== con1 disconnected ==================" @@ -1125,13 +1125,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1145,7 +1145,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1155,7 +1155,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 "================== con2 disconnected ==================" @@ -1197,13 +1197,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1217,7 +1217,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1227,7 +1227,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 "================== con3 disconnected ==================" @@ -1268,13 +1268,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1288,7 +1288,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1298,7 +1298,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 "================== con4 disconnected ==================" @@ -1338,13 +1338,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1358,7 +1358,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1368,7 +1368,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1409,13 +1409,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1429,7 +1429,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1439,7 +1439,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1480,13 +1480,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1500,7 +1500,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1510,7 +1510,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1551,13 +1551,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1571,7 +1571,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1581,7 +1581,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1622,13 +1622,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1642,7 +1642,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1652,7 +1652,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_global_by_event_name; diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result index 333d3844867..4d089c810a1 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -267,13 +267,13 @@ 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 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -287,7 +287,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -297,7 +297,7 @@ TABLE test t2 12 4 8 2 0 0 0 2 0 0 4 TABLE test t3 14 4 10 2 0 0 0 2 0 0 5 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 24 TABLE test t3 31 select concat(current_user(), " is connected") as status; @@ -333,13 +333,13 @@ 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 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -353,7 +353,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -363,7 +363,7 @@ TABLE test t2 12 4 8 2 0 0 0 2 0 0 4 TABLE test t3 14 4 10 2 0 0 0 2 0 0 5 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 24 TABLE test t3 31 insert into test.t1 set a=201, b=1, c=1; @@ -435,13 +435,13 @@ 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 92 +wait/io/table/sql/handler 94 wait/lock/table/sql/handler 72 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -455,7 +455,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +TABLE test t1 20 13 7 13 2 5 0 TABLE test t2 30 20 10 20 4 6 0 TABLE test t3 44 29 15 29 6 9 0 execute dump_waits_table_lock; @@ -465,7 +465,7 @@ TABLE test t2 24 8 16 4 0 0 0 4 0 0 8 TABLE test t3 28 8 20 4 0 0 0 4 0 0 10 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 38 +TABLE test t1 40 TABLE test t2 54 TABLE test t3 72 select concat(current_user(), " is connected") as status; @@ -506,13 +506,13 @@ 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 92 +wait/io/table/sql/handler 94 wait/lock/table/sql/handler 72 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -526,7 +526,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +TABLE test t1 20 13 7 13 2 5 0 TABLE test t2 30 20 10 20 4 6 0 TABLE test t3 44 29 15 29 6 9 0 execute dump_waits_table_lock; @@ -536,7 +536,7 @@ TABLE test t2 24 8 16 4 0 0 0 4 0 0 8 TABLE test t3 28 8 20 4 0 0 0 4 0 0 10 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 38 +TABLE test t1 40 TABLE test t2 54 TABLE test t3 72 insert into test.t1 set a=301, b=1, c=1; @@ -620,13 +620,13 @@ 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 168 +wait/io/table/sql/handler 170 wait/lock/table/sql/handler 108 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -640,7 +640,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +TABLE test t1 35 23 12 23 3 9 0 TABLE test t2 54 36 18 36 6 12 0 TABLE test t3 81 54 27 54 9 18 0 execute dump_waits_table_lock; @@ -650,7 +650,7 @@ TABLE test t2 36 12 24 6 0 0 0 6 0 0 12 TABLE test t3 42 12 30 6 0 0 0 6 0 0 15 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 63 +TABLE test t1 65 TABLE test t2 90 TABLE test t3 123 select concat(current_user(), " is connected") as status; @@ -696,13 +696,13 @@ 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 168 +wait/io/table/sql/handler 170 wait/lock/table/sql/handler 108 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -716,7 +716,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +TABLE test t1 35 23 12 23 3 9 0 TABLE test t2 54 36 18 36 6 12 0 TABLE test t3 81 54 27 54 9 18 0 execute dump_waits_table_lock; @@ -726,7 +726,7 @@ TABLE test t2 36 12 24 6 0 0 0 6 0 0 12 TABLE test t3 42 12 30 6 0 0 0 6 0 0 15 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 63 +TABLE test t1 65 TABLE test t2 90 TABLE test t3 123 insert into test.t1 set a=401, b=1, c=1; @@ -822,13 +822,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 144 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -842,7 +842,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -852,7 +852,7 @@ TABLE test t2 48 16 32 8 0 0 0 8 0 0 16 TABLE test t3 56 16 40 8 0 0 0 8 0 0 20 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 91 +TABLE test t1 93 TABLE test t2 132 TABLE test t3 184 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -900,13 +900,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -920,7 +920,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -930,7 +930,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 flush tables; @@ -975,13 +975,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -995,7 +995,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1005,7 +1005,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 set global read_only=1; @@ -1051,13 +1051,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1071,7 +1071,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1081,7 +1081,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 "================== con1 disconnected ==================" @@ -1124,13 +1124,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1144,7 +1144,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1154,7 +1154,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 "================== con2 disconnected ==================" @@ -1196,13 +1196,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1216,7 +1216,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1226,7 +1226,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 "================== con3 disconnected ==================" @@ -1267,13 +1267,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1287,7 +1287,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1297,7 +1297,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 "================== con4 disconnected ==================" @@ -1337,13 +1337,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1357,7 +1357,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1367,7 +1367,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1408,13 +1408,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1428,7 +1428,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1438,7 +1438,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1479,13 +1479,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1499,7 +1499,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1509,7 +1509,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1550,13 +1550,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1570,7 +1570,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1580,7 +1580,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1621,13 +1621,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1641,7 +1641,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1651,7 +1651,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_global_by_event_name; diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result index 61af4a203c9..23bd1294445 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result @@ -61,7 +61,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -244,7 +244,7 @@ a b c d "================== Step 3 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username status user2 not found @@ -254,29 +254,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 24 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 24 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/lock/table/sql/handler 10 TABLE test t1 wait/io/table/sql/handler 17 TABLE test t3 wait/lock/table/sql/handler 14 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -290,7 +290,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -300,7 +300,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 0 TABLE test t3 31 select concat(current_user(), " is connected") as status; @@ -309,7 +309,7 @@ user2@localhost is connected "================== Step 4 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -320,33 +320,33 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 24 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 24 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/lock/table/sql/handler 10 TABLE test t1 wait/io/table/sql/handler 17 TABLE test t3 wait/lock/table/sql/handler 14 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -360,7 +360,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -370,7 +370,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 0 TABLE test t3 31 insert into test.t1 set a=201, b=1, c=1; @@ -415,7 +415,7 @@ a b c d "================== Step 5 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -426,33 +426,33 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 24 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 24 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/lock/table/sql/handler 10 TABLE test t1 wait/io/table/sql/handler 17 TABLE test t3 wait/lock/table/sql/handler 14 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -466,7 +466,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -476,7 +476,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 0 TABLE test t3 31 select concat(current_user(), " is connected") as status; @@ -485,7 +485,7 @@ user3@localhost is connected "================== Step 6 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -497,7 +497,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -505,7 +505,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -513,21 +513,21 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 24 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 24 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/lock/table/sql/handler 10 TABLE test t1 wait/io/table/sql/handler 17 TABLE test t3 wait/lock/table/sql/handler 14 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -541,7 +541,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -551,7 +551,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 0 TABLE test t3 31 insert into test.t1 set a=301, b=1, c=1; @@ -603,7 +603,7 @@ a b c d "================== Step 7 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -615,7 +615,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -623,7 +623,7 @@ user3 localhost wait/io/table/sql/handler 52 user3 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -631,21 +631,21 @@ user3 wait/io/table/sql/handler 52 user3 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 48 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 48 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 20 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 28 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -659,7 +659,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -669,7 +669,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 41 +TABLE test t1 43 TABLE test t2 0 TABLE test t3 82 select concat(current_user(), " is connected") as status; @@ -678,7 +678,7 @@ user4@localhost is connected "================== Step 8 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -691,7 +691,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -701,7 +701,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -711,21 +711,21 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 48 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 48 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 20 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 28 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -739,7 +739,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -749,7 +749,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 41 +TABLE test t1 43 TABLE test t2 0 TABLE test t3 82 insert into test.t1 set a=401, b=1, c=1; @@ -808,7 +808,7 @@ a b c d "================== Step 9 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -821,7 +821,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -831,7 +831,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -841,21 +841,21 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 48 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 48 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 20 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 28 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -869,7 +869,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -879,7 +879,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 41 +TABLE test t1 43 TABLE test t2 0 TABLE test t3 82 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -890,7 +890,7 @@ unlock tables; "================== Step 10 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -903,7 +903,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -913,7 +913,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -923,21 +923,21 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 TABLE test t3 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -951,7 +951,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -961,7 +961,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 flush tables; @@ -969,7 +969,7 @@ flush tables; "================== Step 11 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -982,7 +982,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -992,7 +992,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1002,21 +1002,21 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 TABLE test t3 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1030,7 +1030,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1040,7 +1040,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 set global read_only=1; @@ -1049,7 +1049,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -1062,7 +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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1072,7 +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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1082,21 +1082,21 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 TABLE test t3 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1110,7 +1110,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1120,7 +1120,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 "================== con1 disconnected ==================" @@ -1139,7 +1139,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1149,7 +1149,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1159,21 +1159,21 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 TABLE test t3 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1187,7 +1187,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1197,7 +1197,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 "================== con2 disconnected ==================" @@ -1215,7 +1215,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1225,7 +1225,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1235,21 +1235,21 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 TABLE test t3 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1263,7 +1263,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1273,7 +1273,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 "================== con3 disconnected ==================" @@ -1290,7 +1290,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1300,7 +1300,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1310,21 +1310,21 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 TABLE test t3 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1338,7 +1338,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1348,7 +1348,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 "================== con4 disconnected ==================" @@ -1364,7 +1364,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1374,7 +1374,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1384,21 +1384,21 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 TABLE test t3 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1412,7 +1412,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1422,7 +1422,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1439,7 +1439,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1449,7 +1449,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1459,21 +1459,21 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 TABLE test t3 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1487,7 +1487,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1497,7 +1497,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1524,7 +1524,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1534,21 +1534,21 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 TABLE test t3 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1562,7 +1562,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1572,7 +1572,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1609,21 +1609,21 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 TABLE test t3 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1637,7 +1637,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1647,7 +1647,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1688,17 +1688,17 @@ 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 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 TABLE test t3 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1712,7 +1712,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1722,7 +1722,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 truncate performance_schema.events_waits_summary_global_by_event_name; @@ -1767,7 +1767,7 @@ 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 -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 TABLE test t3 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result index ba109d45783..7edfc3824bb 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result @@ -60,7 +60,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -243,7 +243,7 @@ a b c d "================== Step 3 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username status user2 not found @@ -253,23 +253,23 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 36 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/lock/table/sql/handler 10 TABLE test t1 wait/io/table/sql/handler 12 TABLE test t2 wait/lock/table/sql/handler 12 TABLE test t2 @@ -277,7 +277,7 @@ wait/io/table/sql/handler 17 TABLE test t3 wait/lock/table/sql/handler 14 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -291,7 +291,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -301,7 +301,7 @@ TABLE test t2 12 4 8 2 0 0 0 2 0 0 4 TABLE test t3 14 4 10 2 0 0 0 2 0 0 5 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 24 TABLE test t3 31 select concat(current_user(), " is connected") as status; @@ -310,7 +310,7 @@ user2@localhost is connected "================== Step 4 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -321,27 +321,27 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 36 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/lock/table/sql/handler 10 TABLE test t1 wait/io/table/sql/handler 12 TABLE test t2 wait/lock/table/sql/handler 12 TABLE test t2 @@ -349,7 +349,7 @@ wait/io/table/sql/handler 17 TABLE test t3 wait/lock/table/sql/handler 14 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -363,7 +363,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -373,7 +373,7 @@ TABLE test t2 12 4 8 2 0 0 0 2 0 0 4 TABLE test t3 14 4 10 2 0 0 0 2 0 0 5 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 24 TABLE test t3 31 insert into test.t1 set a=201, b=1, c=1; @@ -418,7 +418,7 @@ a b c d "================== Step 5 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -429,27 +429,27 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 36 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/lock/table/sql/handler 10 TABLE test t1 wait/io/table/sql/handler 12 TABLE test t2 wait/lock/table/sql/handler 12 TABLE test t2 @@ -457,7 +457,7 @@ wait/io/table/sql/handler 17 TABLE test t3 wait/lock/table/sql/handler 14 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -471,7 +471,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -481,7 +481,7 @@ TABLE test t2 12 4 8 2 0 0 0 2 0 0 4 TABLE test t3 14 4 10 2 0 0 0 2 0 0 5 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 24 TABLE test t3 31 select concat(current_user(), " is connected") as status; @@ -490,7 +490,7 @@ user3@localhost is connected "================== Step 6 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -502,7 +502,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -510,7 +510,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -518,15 +518,15 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 36 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/lock/table/sql/handler 10 TABLE test t1 wait/io/table/sql/handler 12 TABLE test t2 wait/lock/table/sql/handler 12 TABLE test t2 @@ -534,7 +534,7 @@ wait/io/table/sql/handler 17 TABLE test t3 wait/lock/table/sql/handler 14 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -548,7 +548,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -558,7 +558,7 @@ TABLE test t2 12 4 8 2 0 0 0 2 0 0 4 TABLE test t3 14 4 10 2 0 0 0 2 0 0 5 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 24 TABLE test t3 31 insert into test.t1 set a=301, b=1, c=1; @@ -610,7 +610,7 @@ a b c d "================== Step 7 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -622,7 +622,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -630,7 +630,7 @@ user3 localhost wait/io/table/sql/handler 76 user3 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -638,15 +638,15 @@ user3 wait/io/table/sql/handler 76 user3 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 72 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 20 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 wait/lock/table/sql/handler 24 TABLE test t2 @@ -654,7 +654,7 @@ wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 28 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -668,7 +668,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -678,7 +678,7 @@ TABLE test t2 24 8 16 4 0 0 0 4 0 0 8 TABLE test t3 28 8 20 4 0 0 0 4 0 0 10 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 41 +TABLE test t1 43 TABLE test t2 60 TABLE test t3 82 select concat(current_user(), " is connected") as status; @@ -687,7 +687,7 @@ user4@localhost is connected "================== Step 8 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -700,7 +700,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -710,7 +710,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -720,15 +720,15 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 72 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 20 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 wait/lock/table/sql/handler 24 TABLE test t2 @@ -736,7 +736,7 @@ wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 28 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -750,7 +750,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -760,7 +760,7 @@ TABLE test t2 24 8 16 4 0 0 0 4 0 0 8 TABLE test t3 28 8 20 4 0 0 0 4 0 0 10 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 41 +TABLE test t1 43 TABLE test t2 60 TABLE test t3 82 insert into test.t1 set a=401, b=1, c=1; @@ -819,7 +819,7 @@ a b c d "================== Step 9 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -832,7 +832,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -842,7 +842,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -852,15 +852,15 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 72 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 20 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 wait/lock/table/sql/handler 24 TABLE test t2 @@ -868,7 +868,7 @@ wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 28 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -882,7 +882,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -892,7 +892,7 @@ TABLE test t2 24 8 16 4 0 0 0 4 0 0 8 TABLE test t3 28 8 20 4 0 0 0 4 0 0 10 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 41 +TABLE test t1 43 TABLE test t2 60 TABLE test t3 82 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -903,7 +903,7 @@ unlock tables; "================== Step 10 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -916,7 +916,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -926,7 +926,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -936,15 +936,15 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 wait/lock/table/sql/handler 28 TABLE test t2 @@ -952,7 +952,7 @@ wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -966,7 +966,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -976,7 +976,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 flush tables; @@ -984,7 +984,7 @@ flush tables; "================== Step 11 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -997,7 +997,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1007,7 +1007,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1017,15 +1017,15 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 wait/lock/table/sql/handler 28 TABLE test t2 @@ -1033,7 +1033,7 @@ wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1047,7 +1047,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1057,7 +1057,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 set global read_only=1; @@ -1066,7 +1066,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -1079,7 +1079,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1089,7 +1089,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1099,15 +1099,15 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 wait/lock/table/sql/handler 28 TABLE test t2 @@ -1115,7 +1115,7 @@ wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1129,7 +1129,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1139,7 +1139,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 "================== con1 disconnected ==================" @@ -1158,7 +1158,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1168,7 +1168,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1178,15 +1178,15 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 wait/lock/table/sql/handler 28 TABLE test t2 @@ -1194,7 +1194,7 @@ wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1208,7 +1208,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1218,7 +1218,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 "================== con2 disconnected ==================" @@ -1236,7 +1236,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1246,7 +1246,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1256,15 +1256,15 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 wait/lock/table/sql/handler 28 TABLE test t2 @@ -1272,7 +1272,7 @@ wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1286,7 +1286,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1296,7 +1296,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 "================== con3 disconnected ==================" @@ -1313,7 +1313,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1323,7 +1323,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1333,15 +1333,15 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 wait/lock/table/sql/handler 28 TABLE test t2 @@ -1349,7 +1349,7 @@ wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1363,7 +1363,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1373,7 +1373,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 "================== con4 disconnected ==================" @@ -1389,7 +1389,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1399,7 +1399,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1409,15 +1409,15 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 wait/lock/table/sql/handler 28 TABLE test t2 @@ -1425,7 +1425,7 @@ wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1439,7 +1439,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1449,7 +1449,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1466,7 +1466,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1476,7 +1476,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1486,15 +1486,15 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 wait/lock/table/sql/handler 28 TABLE test t2 @@ -1502,7 +1502,7 @@ wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1516,7 +1516,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1526,7 +1526,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1553,7 +1553,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1563,15 +1563,15 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 wait/lock/table/sql/handler 28 TABLE test t2 @@ -1579,7 +1579,7 @@ wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1593,7 +1593,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1603,7 +1603,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1640,15 +1640,15 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 wait/lock/table/sql/handler 28 TABLE test t2 @@ -1656,7 +1656,7 @@ wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1670,7 +1670,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1680,7 +1680,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1721,11 +1721,11 @@ 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 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 wait/lock/table/sql/handler 28 TABLE test t2 @@ -1733,7 +1733,7 @@ wait/io/table/sql/handler 54 TABLE test t3 wait/lock/table/sql/handler 32 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1747,7 +1747,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1757,7 +1757,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 truncate performance_schema.events_waits_summary_global_by_event_name; @@ -1802,7 +1802,7 @@ 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 -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/lock/table/sql/handler 24 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 wait/lock/table/sql/handler 28 TABLE test t2 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result index f19d737061d..99d2e7d4655 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result @@ -61,7 +61,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -244,7 +244,7 @@ a b c d "================== Step 3 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username status user2 not found @@ -254,29 +254,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 24 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 24 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/lock/table/sql/handler 10 TABLE test t1 wait/io/table/sql/handler 17 TABLE test t3 wait/lock/table/sql/handler 14 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -290,7 +290,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -300,7 +300,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 0 TABLE test t3 31 select concat(current_user(), " is connected") as status; @@ -309,7 +309,7 @@ user2@localhost is connected "================== Step 4 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -320,33 +320,33 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 24 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 24 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/lock/table/sql/handler 10 TABLE test t1 wait/io/table/sql/handler 17 TABLE test t3 wait/lock/table/sql/handler 14 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -360,7 +360,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -370,7 +370,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 0 TABLE test t3 31 insert into test.t1 set a=201, b=1, c=1; @@ -415,7 +415,7 @@ a b c d "================== Step 5 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -426,33 +426,33 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 62 +localhost wait/io/table/sql/handler 64 localhost wait/lock/table/sql/handler 48 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 62 +wait/io/table/sql/handler 64 wait/lock/table/sql/handler 48 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 18 TABLE test t1 +wait/io/table/sql/handler 20 TABLE test t1 wait/lock/table/sql/handler 20 TABLE test t1 wait/io/table/sql/handler 44 TABLE test t3 wait/lock/table/sql/handler 28 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -466,7 +466,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +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 execute dump_waits_table_lock; @@ -476,7 +476,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 38 +TABLE test t1 40 TABLE test t2 0 TABLE test t3 72 select concat(current_user(), " is connected") as status; @@ -485,7 +485,7 @@ user3@localhost is connected "================== Step 6 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -497,7 +497,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -505,7 +505,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -513,21 +513,21 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 62 +localhost wait/io/table/sql/handler 64 localhost wait/lock/table/sql/handler 48 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 62 +wait/io/table/sql/handler 64 wait/lock/table/sql/handler 48 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 18 TABLE test t1 +wait/io/table/sql/handler 20 TABLE test t1 wait/lock/table/sql/handler 20 TABLE test t1 wait/io/table/sql/handler 44 TABLE test t3 wait/lock/table/sql/handler 28 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -541,7 +541,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +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 execute dump_waits_table_lock; @@ -551,7 +551,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 38 +TABLE test t1 40 TABLE test t2 0 TABLE test t3 72 insert into test.t1 set a=301, b=1, c=1; @@ -603,7 +603,7 @@ a b c d "================== Step 7 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -615,7 +615,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -623,7 +623,7 @@ user3 localhost wait/io/table/sql/handler 52 user3 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -631,21 +631,21 @@ user3 wait/io/table/sql/handler 52 user3 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 114 +localhost wait/io/table/sql/handler 116 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 114 +wait/io/table/sql/handler 116 wait/lock/table/sql/handler 72 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 33 TABLE test t1 +wait/io/table/sql/handler 35 TABLE test t1 wait/lock/table/sql/handler 30 TABLE test t1 wait/io/table/sql/handler 81 TABLE test t3 wait/lock/table/sql/handler 42 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -659,7 +659,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +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 execute dump_waits_table_lock; @@ -669,7 +669,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 63 +TABLE test t1 65 TABLE test t2 0 TABLE test t3 123 select concat(current_user(), " is connected") as status; @@ -678,7 +678,7 @@ user4@localhost is connected "================== Step 8 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -691,7 +691,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -701,7 +701,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -711,21 +711,21 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 114 +localhost wait/io/table/sql/handler 116 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 114 +wait/io/table/sql/handler 116 wait/lock/table/sql/handler 72 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 33 TABLE test t1 +wait/io/table/sql/handler 35 TABLE test t1 wait/lock/table/sql/handler 30 TABLE test t1 wait/io/table/sql/handler 81 TABLE test t3 wait/lock/table/sql/handler 42 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -739,7 +739,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +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 execute dump_waits_table_lock; @@ -749,7 +749,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 63 +TABLE test t1 65 TABLE test t2 0 TABLE test t3 123 insert into test.t1 set a=401, b=1, c=1; @@ -808,7 +808,7 @@ a b c d "================== Step 9 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -821,7 +821,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -831,7 +831,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -841,21 +841,21 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 96 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 96 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 40 TABLE test t1 wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 56 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -869,7 +869,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -879,7 +879,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 91 +TABLE test t1 93 TABLE test t2 0 TABLE test t3 184 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -890,7 +890,7 @@ unlock tables; "================== Step 10 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -903,7 +903,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -913,7 +913,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -923,21 +923,21 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -951,7 +951,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -961,7 +961,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 flush tables; @@ -969,7 +969,7 @@ flush tables; "================== Step 11 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -982,7 +982,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -992,7 +992,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -1002,21 +1002,21 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1030,7 +1030,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1040,7 +1040,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 set global read_only=1; @@ -1049,7 +1049,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -1062,7 +1062,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -1072,7 +1072,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -1082,21 +1082,21 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1110,7 +1110,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1120,7 +1120,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 "================== con1 disconnected ==================" @@ -1139,7 +1139,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -1149,7 +1149,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -1159,21 +1159,21 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1187,7 +1187,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1197,7 +1197,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 "================== con2 disconnected ==================" @@ -1215,7 +1215,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -1225,7 +1225,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -1235,21 +1235,21 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1263,7 +1263,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1273,7 +1273,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 "================== con3 disconnected ==================" @@ -1290,7 +1290,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -1300,7 +1300,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -1310,21 +1310,21 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1338,7 +1338,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1348,7 +1348,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 "================== con4 disconnected ==================" @@ -1364,7 +1364,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -1374,7 +1374,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -1384,21 +1384,21 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1412,7 +1412,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1422,7 +1422,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1439,7 +1439,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -1449,7 +1449,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -1459,21 +1459,21 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1487,7 +1487,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1497,7 +1497,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1524,7 +1524,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -1534,21 +1534,21 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1562,7 +1562,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1572,7 +1572,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1609,21 +1609,21 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1637,7 +1637,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1647,7 +1647,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1688,17 +1688,17 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1712,7 +1712,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1722,7 +1722,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_global_by_event_name; @@ -1767,7 +1767,7 @@ 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 -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result index 05c4be28be3..f8c660bd932 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result @@ -60,7 +60,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -243,7 +243,7 @@ a b c d "================== Step 3 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username status user2 not found @@ -253,23 +253,23 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 36 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/lock/table/sql/handler 10 TABLE test t1 wait/io/table/sql/handler 12 TABLE test t2 wait/lock/table/sql/handler 12 TABLE test t2 @@ -277,7 +277,7 @@ wait/io/table/sql/handler 17 TABLE test t3 wait/lock/table/sql/handler 14 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -291,7 +291,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -301,7 +301,7 @@ TABLE test t2 12 4 8 2 0 0 0 2 0 0 4 TABLE test t3 14 4 10 2 0 0 0 2 0 0 5 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 24 TABLE test t3 31 select concat(current_user(), " is connected") as status; @@ -310,7 +310,7 @@ user2@localhost is connected "================== Step 4 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -321,27 +321,27 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 36 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/lock/table/sql/handler 10 TABLE test t1 wait/io/table/sql/handler 12 TABLE test t2 wait/lock/table/sql/handler 12 TABLE test t2 @@ -349,7 +349,7 @@ wait/io/table/sql/handler 17 TABLE test t3 wait/lock/table/sql/handler 14 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -363,7 +363,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -373,7 +373,7 @@ TABLE test t2 12 4 8 2 0 0 0 2 0 0 4 TABLE test t3 14 4 10 2 0 0 0 2 0 0 5 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 24 TABLE test t3 31 insert into test.t1 set a=201, b=1, c=1; @@ -418,7 +418,7 @@ a b c d "================== Step 5 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -429,27 +429,27 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 92 +localhost wait/io/table/sql/handler 94 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 92 +wait/io/table/sql/handler 94 wait/lock/table/sql/handler 72 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 18 TABLE test t1 +wait/io/table/sql/handler 20 TABLE test t1 wait/lock/table/sql/handler 20 TABLE test t1 wait/io/table/sql/handler 30 TABLE test t2 wait/lock/table/sql/handler 24 TABLE test t2 @@ -457,7 +457,7 @@ wait/io/table/sql/handler 44 TABLE test t3 wait/lock/table/sql/handler 28 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -471,7 +471,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +TABLE test t1 20 13 7 13 2 5 0 TABLE test t2 30 20 10 20 4 6 0 TABLE test t3 44 29 15 29 6 9 0 execute dump_waits_table_lock; @@ -481,7 +481,7 @@ TABLE test t2 24 8 16 4 0 0 0 4 0 0 8 TABLE test t3 28 8 20 4 0 0 0 4 0 0 10 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 38 +TABLE test t1 40 TABLE test t2 54 TABLE test t3 72 select concat(current_user(), " is connected") as status; @@ -490,7 +490,7 @@ user3@localhost is connected "================== Step 6 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -502,7 +502,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -510,7 +510,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -518,15 +518,15 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 92 +localhost wait/io/table/sql/handler 94 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 92 +wait/io/table/sql/handler 94 wait/lock/table/sql/handler 72 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 18 TABLE test t1 +wait/io/table/sql/handler 20 TABLE test t1 wait/lock/table/sql/handler 20 TABLE test t1 wait/io/table/sql/handler 30 TABLE test t2 wait/lock/table/sql/handler 24 TABLE test t2 @@ -534,7 +534,7 @@ wait/io/table/sql/handler 44 TABLE test t3 wait/lock/table/sql/handler 28 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -548,7 +548,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +TABLE test t1 20 13 7 13 2 5 0 TABLE test t2 30 20 10 20 4 6 0 TABLE test t3 44 29 15 29 6 9 0 execute dump_waits_table_lock; @@ -558,7 +558,7 @@ TABLE test t2 24 8 16 4 0 0 0 4 0 0 8 TABLE test t3 28 8 20 4 0 0 0 4 0 0 10 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 38 +TABLE test t1 40 TABLE test t2 54 TABLE test t3 72 insert into test.t1 set a=301, b=1, c=1; @@ -610,7 +610,7 @@ a b c d "================== Step 7 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -622,7 +622,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -630,7 +630,7 @@ user3 localhost wait/io/table/sql/handler 76 user3 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -638,15 +638,15 @@ user3 wait/io/table/sql/handler 76 user3 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 168 +localhost wait/io/table/sql/handler 170 localhost wait/lock/table/sql/handler 108 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 168 +wait/io/table/sql/handler 170 wait/lock/table/sql/handler 108 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 33 TABLE test t1 +wait/io/table/sql/handler 35 TABLE test t1 wait/lock/table/sql/handler 30 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t2 wait/lock/table/sql/handler 36 TABLE test t2 @@ -654,7 +654,7 @@ wait/io/table/sql/handler 81 TABLE test t3 wait/lock/table/sql/handler 42 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -668,7 +668,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +TABLE test t1 35 23 12 23 3 9 0 TABLE test t2 54 36 18 36 6 12 0 TABLE test t3 81 54 27 54 9 18 0 execute dump_waits_table_lock; @@ -678,7 +678,7 @@ TABLE test t2 36 12 24 6 0 0 0 6 0 0 12 TABLE test t3 42 12 30 6 0 0 0 6 0 0 15 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 63 +TABLE test t1 65 TABLE test t2 90 TABLE test t3 123 select concat(current_user(), " is connected") as status; @@ -687,7 +687,7 @@ user4@localhost is connected "================== Step 8 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -700,7 +700,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -710,7 +710,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -720,15 +720,15 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 168 +localhost wait/io/table/sql/handler 170 localhost wait/lock/table/sql/handler 108 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 168 +wait/io/table/sql/handler 170 wait/lock/table/sql/handler 108 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 33 TABLE test t1 +wait/io/table/sql/handler 35 TABLE test t1 wait/lock/table/sql/handler 30 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t2 wait/lock/table/sql/handler 36 TABLE test t2 @@ -736,7 +736,7 @@ wait/io/table/sql/handler 81 TABLE test t3 wait/lock/table/sql/handler 42 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -750,7 +750,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +TABLE test t1 35 23 12 23 3 9 0 TABLE test t2 54 36 18 36 6 12 0 TABLE test t3 81 54 27 54 9 18 0 execute dump_waits_table_lock; @@ -760,7 +760,7 @@ TABLE test t2 36 12 24 6 0 0 0 6 0 0 12 TABLE test t3 42 12 30 6 0 0 0 6 0 0 15 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 63 +TABLE test t1 65 TABLE test t2 90 TABLE test t3 123 insert into test.t1 set a=401, b=1, c=1; @@ -819,7 +819,7 @@ a b c d "================== Step 9 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -832,7 +832,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -842,7 +842,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -852,15 +852,15 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 144 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 144 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 40 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/lock/table/sql/handler 48 TABLE test t2 @@ -868,7 +868,7 @@ wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 56 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -882,7 +882,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -892,7 +892,7 @@ TABLE test t2 48 16 32 8 0 0 0 8 0 0 16 TABLE test t3 56 16 40 8 0 0 0 8 0 0 20 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 91 +TABLE test t1 93 TABLE test t2 132 TABLE test t3 184 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -903,7 +903,7 @@ unlock tables; "================== Step 10 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -916,7 +916,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -926,7 +926,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -936,15 +936,15 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/lock/table/sql/handler 52 TABLE test t2 @@ -952,7 +952,7 @@ wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -966,7 +966,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -976,7 +976,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 flush tables; @@ -984,7 +984,7 @@ flush tables; "================== Step 11 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -997,7 +997,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -1007,7 +1007,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -1017,15 +1017,15 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/lock/table/sql/handler 52 TABLE test t2 @@ -1033,7 +1033,7 @@ wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1047,7 +1047,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1057,7 +1057,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 set global read_only=1; @@ -1066,7 +1066,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -1079,7 +1079,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -1089,7 +1089,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -1099,15 +1099,15 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/lock/table/sql/handler 52 TABLE test t2 @@ -1115,7 +1115,7 @@ wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1129,7 +1129,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1139,7 +1139,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 "================== con1 disconnected ==================" @@ -1158,7 +1158,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -1168,7 +1168,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -1178,15 +1178,15 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/lock/table/sql/handler 52 TABLE test t2 @@ -1194,7 +1194,7 @@ wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1208,7 +1208,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1218,7 +1218,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 "================== con2 disconnected ==================" @@ -1236,7 +1236,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -1246,7 +1246,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -1256,15 +1256,15 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/lock/table/sql/handler 52 TABLE test t2 @@ -1272,7 +1272,7 @@ wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1286,7 +1286,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1296,7 +1296,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 "================== con3 disconnected ==================" @@ -1313,7 +1313,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -1323,7 +1323,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -1333,15 +1333,15 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/lock/table/sql/handler 52 TABLE test t2 @@ -1349,7 +1349,7 @@ wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1363,7 +1363,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1373,7 +1373,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 "================== con4 disconnected ==================" @@ -1389,7 +1389,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -1399,7 +1399,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -1409,15 +1409,15 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/lock/table/sql/handler 52 TABLE test t2 @@ -1425,7 +1425,7 @@ wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1439,7 +1439,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1449,7 +1449,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1466,7 +1466,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -1476,7 +1476,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -1486,15 +1486,15 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/lock/table/sql/handler 52 TABLE test t2 @@ -1502,7 +1502,7 @@ wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1516,7 +1516,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1526,7 +1526,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1553,7 +1553,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -1563,15 +1563,15 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/lock/table/sql/handler 52 TABLE test t2 @@ -1579,7 +1579,7 @@ wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1593,7 +1593,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1603,7 +1603,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1640,15 +1640,15 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/lock/table/sql/handler 52 TABLE test t2 @@ -1656,7 +1656,7 @@ wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1670,7 +1670,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1680,7 +1680,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1721,11 +1721,11 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/lock/table/sql/handler 52 TABLE test t2 @@ -1733,7 +1733,7 @@ wait/io/table/sql/handler 128 TABLE test t3 wait/lock/table/sql/handler 60 TABLE test t3 execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1747,7 +1747,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1757,7 +1757,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_global_by_event_name; @@ -1802,7 +1802,7 @@ 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 -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/lock/table/sql/handler 44 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/lock/table/sql/handler 52 TABLE test t2 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_off.result b/mysql-test/suite/perfschema/r/table_aggregate_off.result index 50935c7afbe..73ed3550a77 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_off.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_off.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result index 83345b6edda..3906c6f6b84 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result @@ -63,7 +63,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -246,7 +246,7 @@ a b c d "================== Step 3 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username status user2 not found @@ -256,25 +256,25 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 24 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 24 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -288,7 +288,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -298,7 +298,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 0 TABLE test t3 31 select concat(current_user(), " is connected") as status; @@ -307,7 +307,7 @@ user2@localhost is connected "================== Step 4 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -318,29 +318,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 24 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 24 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -354,7 +354,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -364,7 +364,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 0 TABLE test t3 31 insert into test.t1 set a=201, b=1, c=1; @@ -409,7 +409,7 @@ a b c d "================== Step 5 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -420,29 +420,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 24 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 24 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -456,7 +456,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -466,7 +466,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 0 TABLE test t3 31 select concat(current_user(), " is connected") as status; @@ -475,7 +475,7 @@ user3@localhost is connected "================== Step 6 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -487,7 +487,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -495,7 +495,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -503,17 +503,17 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 24 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 24 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -527,7 +527,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -537,7 +537,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 0 TABLE test t3 31 insert into test.t1 set a=301, b=1, c=1; @@ -589,7 +589,7 @@ a b c d "================== Step 7 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -601,7 +601,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -609,7 +609,7 @@ user3 localhost wait/io/table/sql/handler 52 user3 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -617,17 +617,17 @@ user3 wait/io/table/sql/handler 52 user3 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 48 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 48 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -641,7 +641,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -651,7 +651,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 41 +TABLE test t1 43 TABLE test t2 0 TABLE test t3 82 select concat(current_user(), " is connected") as status; @@ -660,7 +660,7 @@ user4@localhost is connected "================== Step 8 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -673,7 +673,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -683,7 +683,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -693,17 +693,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 48 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 48 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -717,7 +717,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -727,7 +727,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 41 +TABLE test t1 43 TABLE test t2 0 TABLE test t3 82 insert into test.t1 set a=401, b=1, c=1; @@ -786,7 +786,7 @@ a b c d "================== Step 9 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -799,7 +799,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -809,7 +809,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -819,17 +819,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 48 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 48 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -843,7 +843,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -853,7 +853,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 41 +TABLE test t1 43 TABLE test t2 0 TABLE test t3 82 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -864,7 +864,7 @@ unlock tables; "================== Step 10 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -877,7 +877,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -887,7 +887,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -897,17 +897,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -921,7 +921,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -931,7 +931,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 flush tables; @@ -939,7 +939,7 @@ flush tables; "================== Step 11 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -952,7 +952,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -962,7 +962,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -972,17 +972,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -996,7 +996,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1006,7 +1006,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 set global read_only=1; @@ -1015,7 +1015,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -1028,7 +1028,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1038,7 +1038,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1048,17 +1048,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1072,7 +1072,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1082,7 +1082,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 "================== con1 disconnected ==================" @@ -1101,7 +1101,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1111,7 +1111,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1121,17 +1121,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1145,7 +1145,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1155,7 +1155,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 "================== con2 disconnected ==================" @@ -1173,7 +1173,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1183,7 +1183,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1193,17 +1193,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1217,7 +1217,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1227,7 +1227,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 "================== con3 disconnected ==================" @@ -1244,7 +1244,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1254,7 +1254,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1264,17 +1264,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1288,7 +1288,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1298,7 +1298,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 "================== con4 disconnected ==================" @@ -1314,7 +1314,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1324,7 +1324,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1334,17 +1334,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1358,7 +1358,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1368,7 +1368,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1385,7 +1385,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1395,7 +1395,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1405,17 +1405,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1429,7 +1429,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1439,7 +1439,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1466,7 +1466,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1476,17 +1476,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1500,7 +1500,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1510,7 +1510,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1547,17 +1547,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +localhost wait/io/table/sql/handler 77 localhost wait/lock/table/sql/handler 56 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1571,7 +1571,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1581,7 +1581,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1622,13 +1622,13 @@ 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 75 +wait/io/table/sql/handler 77 wait/lock/table/sql/handler 56 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1642,7 +1642,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1652,7 +1652,7 @@ TABLE test t2 0 0 0 0 0 0 0 0 0 0 0 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 0 TABLE test t3 86 truncate performance_schema.events_waits_summary_global_by_event_name; diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result index b53f0696f56..0b579f54a66 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -245,7 +245,7 @@ a b c d "================== Step 3 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username status user2 not found @@ -255,25 +255,25 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 36 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -287,7 +287,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -297,7 +297,7 @@ TABLE test t2 12 4 8 2 0 0 0 2 0 0 4 TABLE test t3 14 4 10 2 0 0 0 2 0 0 5 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 24 TABLE test t3 31 select concat(current_user(), " is connected") as status; @@ -306,7 +306,7 @@ user2@localhost is connected "================== Step 4 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -317,29 +317,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 36 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -353,7 +353,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -363,7 +363,7 @@ TABLE test t2 12 4 8 2 0 0 0 2 0 0 4 TABLE test t3 14 4 10 2 0 0 0 2 0 0 5 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 24 TABLE test t3 31 insert into test.t1 set a=201, b=1, c=1; @@ -408,7 +408,7 @@ a b c d "================== Step 5 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -419,29 +419,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 36 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -455,7 +455,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -465,7 +465,7 @@ TABLE test t2 12 4 8 2 0 0 0 2 0 0 4 TABLE test t3 14 4 10 2 0 0 0 2 0 0 5 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 24 TABLE test t3 31 select concat(current_user(), " is connected") as status; @@ -474,7 +474,7 @@ user3@localhost is connected "================== Step 6 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -486,7 +486,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -494,7 +494,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -502,17 +502,17 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 36 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -526,7 +526,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -536,7 +536,7 @@ TABLE test t2 12 4 8 2 0 0 0 2 0 0 4 TABLE test t3 14 4 10 2 0 0 0 2 0 0 5 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 24 TABLE test t3 31 insert into test.t1 set a=301, b=1, c=1; @@ -588,7 +588,7 @@ a b c d "================== Step 7 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -600,7 +600,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -608,7 +608,7 @@ user3 localhost wait/io/table/sql/handler 76 user3 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -616,17 +616,17 @@ user3 wait/io/table/sql/handler 76 user3 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 72 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -640,7 +640,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -650,7 +650,7 @@ TABLE test t2 24 8 16 4 0 0 0 4 0 0 8 TABLE test t3 28 8 20 4 0 0 0 4 0 0 10 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 41 +TABLE test t1 43 TABLE test t2 60 TABLE test t3 82 select concat(current_user(), " is connected") as status; @@ -659,7 +659,7 @@ user4@localhost is connected "================== Step 8 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -672,7 +672,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -682,7 +682,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -692,17 +692,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 72 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -716,7 +716,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -726,7 +726,7 @@ TABLE test t2 24 8 16 4 0 0 0 4 0 0 8 TABLE test t3 28 8 20 4 0 0 0 4 0 0 10 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 41 +TABLE test t1 43 TABLE test t2 60 TABLE test t3 82 insert into test.t1 set a=401, b=1, c=1; @@ -785,7 +785,7 @@ a b c d "================== Step 9 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -798,7 +798,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -808,7 +808,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -818,17 +818,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 72 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -842,7 +842,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -852,7 +852,7 @@ TABLE test t2 24 8 16 4 0 0 0 4 0 0 8 TABLE test t3 28 8 20 4 0 0 0 4 0 0 10 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 41 +TABLE test t1 43 TABLE test t2 60 TABLE test t3 82 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -863,7 +863,7 @@ unlock tables; "================== Step 10 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -876,7 +876,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -886,7 +886,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -896,17 +896,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -920,7 +920,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -930,7 +930,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 flush tables; @@ -938,7 +938,7 @@ flush tables; "================== Step 11 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -951,7 +951,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -961,7 +961,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -971,17 +971,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -995,7 +995,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1005,7 +1005,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 set global read_only=1; @@ -1014,7 +1014,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -1027,7 +1027,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1037,7 +1037,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1047,17 +1047,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1071,7 +1071,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1081,7 +1081,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 "================== con1 disconnected ==================" @@ -1100,7 +1100,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1110,7 +1110,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1120,17 +1120,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1144,7 +1144,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1154,7 +1154,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 "================== con2 disconnected ==================" @@ -1172,7 +1172,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1182,7 +1182,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1192,17 +1192,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1216,7 +1216,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1226,7 +1226,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 "================== con3 disconnected ==================" @@ -1243,7 +1243,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1253,7 +1253,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1263,17 +1263,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1287,7 +1287,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1297,7 +1297,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 "================== con4 disconnected ==================" @@ -1313,7 +1313,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1323,7 +1323,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1333,17 +1333,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1357,7 +1357,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1367,7 +1367,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1384,7 +1384,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1394,7 +1394,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1404,17 +1404,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1428,7 +1428,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1438,7 +1438,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1465,7 +1465,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1475,17 +1475,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1499,7 +1499,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1509,7 +1509,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1546,17 +1546,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 84 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1570,7 +1570,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1580,7 +1580,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1621,13 +1621,13 @@ 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 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 84 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1641,7 +1641,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1651,7 +1651,7 @@ TABLE test t2 28 10 18 4 0 0 1 5 0 0 9 TABLE test t3 32 10 22 4 0 0 1 5 0 0 11 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 45 +TABLE test t1 47 TABLE test t2 64 TABLE test t3 86 truncate performance_schema.events_waits_summary_global_by_event_name; diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result index 3b8f6326031..e137525e5b0 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result @@ -63,7 +63,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -246,7 +246,7 @@ a b c d "================== Step 3 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username status user2 not found @@ -256,25 +256,25 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 24 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 24 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -288,7 +288,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -298,7 +298,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 0 TABLE test t3 31 select concat(current_user(), " is connected") as status; @@ -307,7 +307,7 @@ user2@localhost is connected "================== Step 4 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -318,29 +318,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 24 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 24 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -354,7 +354,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -364,7 +364,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 0 TABLE test t3 31 insert into test.t1 set a=201, b=1, c=1; @@ -409,7 +409,7 @@ a b c d "================== Step 5 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -420,29 +420,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 62 +localhost wait/io/table/sql/handler 64 localhost wait/lock/table/sql/handler 48 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 62 +wait/io/table/sql/handler 64 wait/lock/table/sql/handler 48 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -456,7 +456,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +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 execute dump_waits_table_lock; @@ -466,7 +466,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 38 +TABLE test t1 40 TABLE test t2 0 TABLE test t3 72 select concat(current_user(), " is connected") as status; @@ -475,7 +475,7 @@ user3@localhost is connected "================== Step 6 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -487,7 +487,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -495,7 +495,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -503,17 +503,17 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 62 +localhost wait/io/table/sql/handler 64 localhost wait/lock/table/sql/handler 48 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 62 +wait/io/table/sql/handler 64 wait/lock/table/sql/handler 48 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -527,7 +527,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +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 execute dump_waits_table_lock; @@ -537,7 +537,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 38 +TABLE test t1 40 TABLE test t2 0 TABLE test t3 72 insert into test.t1 set a=301, b=1, c=1; @@ -589,7 +589,7 @@ a b c d "================== Step 7 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -601,7 +601,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -609,7 +609,7 @@ user3 localhost wait/io/table/sql/handler 52 user3 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -617,17 +617,17 @@ user3 wait/io/table/sql/handler 52 user3 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 114 +localhost wait/io/table/sql/handler 116 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 114 +wait/io/table/sql/handler 116 wait/lock/table/sql/handler 72 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -641,7 +641,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +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 execute dump_waits_table_lock; @@ -651,7 +651,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 63 +TABLE test t1 65 TABLE test t2 0 TABLE test t3 123 select concat(current_user(), " is connected") as status; @@ -660,7 +660,7 @@ user4@localhost is connected "================== Step 8 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -673,7 +673,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -683,7 +683,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -693,17 +693,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 114 +localhost wait/io/table/sql/handler 116 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 114 +wait/io/table/sql/handler 116 wait/lock/table/sql/handler 72 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -717,7 +717,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +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 execute dump_waits_table_lock; @@ -727,7 +727,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 63 +TABLE test t1 65 TABLE test t2 0 TABLE test t3 123 insert into test.t1 set a=401, b=1, c=1; @@ -786,7 +786,7 @@ a b c d "================== Step 9 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -799,7 +799,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 24 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -809,7 +809,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 24 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -819,17 +819,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 96 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 96 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -843,7 +843,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -853,7 +853,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 91 +TABLE test t1 93 TABLE test t2 0 TABLE test t3 184 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -864,7 +864,7 @@ unlock tables; "================== Step 10 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -877,7 +877,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -887,7 +887,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -897,17 +897,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -921,7 +921,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -931,7 +931,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 flush tables; @@ -939,7 +939,7 @@ flush tables; "================== Step 11 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -952,7 +952,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -962,7 +962,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -972,17 +972,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -996,7 +996,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1006,7 +1006,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 set global read_only=1; @@ -1015,7 +1015,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -1028,7 +1028,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -1038,7 +1038,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -1048,17 +1048,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1072,7 +1072,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1082,7 +1082,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 "================== con1 disconnected ==================" @@ -1101,7 +1101,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -1111,7 +1111,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -1121,17 +1121,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1145,7 +1145,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1155,7 +1155,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 "================== con2 disconnected ==================" @@ -1173,7 +1173,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -1183,7 +1183,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -1193,17 +1193,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1217,7 +1217,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1227,7 +1227,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 "================== con3 disconnected ==================" @@ -1244,7 +1244,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -1254,7 +1254,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -1264,17 +1264,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1288,7 +1288,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1298,7 +1298,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 "================== con4 disconnected ==================" @@ -1314,7 +1314,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -1324,7 +1324,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -1334,17 +1334,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1358,7 +1358,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1368,7 +1368,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1385,7 +1385,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 32 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 24 @@ -1395,7 +1395,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 24 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -1405,17 +1405,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1429,7 +1429,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1439,7 +1439,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1466,7 +1466,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 32 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 24 @@ -1476,17 +1476,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 24 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1500,7 +1500,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1510,7 +1510,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1547,17 +1547,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 104 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1571,7 +1571,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1581,7 +1581,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1622,13 +1622,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 104 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1642,7 +1642,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1652,7 +1652,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 0 TABLE test t3 188 truncate performance_schema.events_waits_summary_global_by_event_name; diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result index 023ff3760c7..799555b685e 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -245,7 +245,7 @@ a b c d "================== Step 3 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username status user2 not found @@ -255,25 +255,25 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 36 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -287,7 +287,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -297,7 +297,7 @@ TABLE test t2 12 4 8 2 0 0 0 2 0 0 4 TABLE test t3 14 4 10 2 0 0 0 2 0 0 5 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 24 TABLE test t3 31 select concat(current_user(), " is connected") as status; @@ -306,7 +306,7 @@ user2@localhost is connected "================== Step 4 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -317,29 +317,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 36 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 36 execute dump_waits_history; event_name count(event_name) object_type object_schema object_name execute dump_waits_index_io; object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 NULL 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -353,7 +353,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -363,7 +363,7 @@ TABLE test t2 12 4 8 2 0 0 0 2 0 0 4 TABLE test t3 14 4 10 2 0 0 0 2 0 0 5 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 16 +TABLE test t1 18 TABLE test t2 24 TABLE test t3 31 insert into test.t1 set a=201, b=1, c=1; @@ -408,7 +408,7 @@ a b c d "================== Step 5 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -419,29 +419,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 92 +localhost wait/io/table/sql/handler 94 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 92 +wait/io/table/sql/handler 94 wait/lock/table/sql/handler 72 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -455,7 +455,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +TABLE test t1 20 13 7 13 2 5 0 TABLE test t2 30 20 10 20 4 6 0 TABLE test t3 44 29 15 29 6 9 0 execute dump_waits_table_lock; @@ -465,7 +465,7 @@ TABLE test t2 24 8 16 4 0 0 0 4 0 0 8 TABLE test t3 28 8 20 4 0 0 0 4 0 0 10 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 38 +TABLE test t1 40 TABLE test t2 54 TABLE test t3 72 select concat(current_user(), " is connected") as status; @@ -474,7 +474,7 @@ user3@localhost is connected "================== Step 6 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -486,7 +486,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -494,7 +494,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -502,17 +502,17 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 92 +localhost wait/io/table/sql/handler 94 localhost wait/lock/table/sql/handler 72 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 92 +wait/io/table/sql/handler 94 wait/lock/table/sql/handler 72 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -526,7 +526,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +TABLE test t1 20 13 7 13 2 5 0 TABLE test t2 30 20 10 20 4 6 0 TABLE test t3 44 29 15 29 6 9 0 execute dump_waits_table_lock; @@ -536,7 +536,7 @@ TABLE test t2 24 8 16 4 0 0 0 4 0 0 8 TABLE test t3 28 8 20 4 0 0 0 4 0 0 10 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 38 +TABLE test t1 40 TABLE test t2 54 TABLE test t3 72 insert into test.t1 set a=301, b=1, c=1; @@ -588,7 +588,7 @@ a b c d "================== Step 7 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -600,7 +600,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -608,7 +608,7 @@ user3 localhost wait/io/table/sql/handler 76 user3 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -616,17 +616,17 @@ user3 wait/io/table/sql/handler 76 user3 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 168 +localhost wait/io/table/sql/handler 170 localhost wait/lock/table/sql/handler 108 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 168 +wait/io/table/sql/handler 170 wait/lock/table/sql/handler 108 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -640,7 +640,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +TABLE test t1 35 23 12 23 3 9 0 TABLE test t2 54 36 18 36 6 12 0 TABLE test t3 81 54 27 54 9 18 0 execute dump_waits_table_lock; @@ -650,7 +650,7 @@ TABLE test t2 36 12 24 6 0 0 0 6 0 0 12 TABLE test t3 42 12 30 6 0 0 0 6 0 0 15 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 63 +TABLE test t1 65 TABLE test t2 90 TABLE test t3 123 select concat(current_user(), " is connected") as status; @@ -659,7 +659,7 @@ user4@localhost is connected "================== Step 8 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -672,7 +672,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -682,7 +682,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -692,17 +692,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 168 +localhost wait/io/table/sql/handler 170 localhost wait/lock/table/sql/handler 108 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 168 +wait/io/table/sql/handler 170 wait/lock/table/sql/handler 108 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -716,7 +716,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +TABLE test t1 35 23 12 23 3 9 0 TABLE test t2 54 36 18 36 6 12 0 TABLE test t3 81 54 27 54 9 18 0 execute dump_waits_table_lock; @@ -726,7 +726,7 @@ TABLE test t2 36 12 24 6 0 0 0 6 0 0 12 TABLE test t3 42 12 30 6 0 0 0 6 0 0 15 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 63 +TABLE test t1 65 TABLE test t2 90 TABLE test t3 123 insert into test.t1 set a=401, b=1, c=1; @@ -785,7 +785,7 @@ a b c d "================== Step 9 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -798,7 +798,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 36 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -808,7 +808,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 36 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -818,17 +818,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 144 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 144 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -842,7 +842,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -852,7 +852,7 @@ TABLE test t2 48 16 32 8 0 0 0 8 0 0 16 TABLE test t3 56 16 40 8 0 0 0 8 0 0 20 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 91 +TABLE test t1 93 TABLE test t2 132 TABLE test t3 184 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -863,7 +863,7 @@ unlock tables; "================== Step 10 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -876,7 +876,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -886,7 +886,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -896,17 +896,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -920,7 +920,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -930,7 +930,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 flush tables; @@ -938,7 +938,7 @@ flush tables; "================== Step 11 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -951,7 +951,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -961,7 +961,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -971,17 +971,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -995,7 +995,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1005,7 +1005,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 set global read_only=1; @@ -1014,7 +1014,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -1027,7 +1027,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -1037,7 +1037,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -1047,17 +1047,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1071,7 +1071,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1081,7 +1081,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 "================== con1 disconnected ==================" @@ -1100,7 +1100,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -1110,7 +1110,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -1120,17 +1120,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1144,7 +1144,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1154,7 +1154,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 "================== con2 disconnected ==================" @@ -1172,7 +1172,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -1182,7 +1182,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -1192,17 +1192,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1216,7 +1216,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1226,7 +1226,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 "================== con3 disconnected ==================" @@ -1243,7 +1243,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -1253,7 +1253,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -1263,17 +1263,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1287,7 +1287,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1297,7 +1297,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 "================== con4 disconnected ==================" @@ -1313,7 +1313,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -1323,7 +1323,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -1333,17 +1333,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1357,7 +1357,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1367,7 +1367,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1384,7 +1384,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 48 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 36 @@ -1394,7 +1394,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 36 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -1404,17 +1404,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1428,7 +1428,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1438,7 +1438,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1465,7 +1465,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 48 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 36 @@ -1475,17 +1475,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 36 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1499,7 +1499,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1509,7 +1509,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1546,17 +1546,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 156 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1570,7 +1570,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1580,7 +1580,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1621,13 +1621,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 156 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1641,7 +1641,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1651,7 +1651,7 @@ TABLE test t2 52 18 34 8 0 0 1 9 0 0 17 TABLE test t3 60 18 42 8 0 0 1 9 0 0 21 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 95 +TABLE test t1 97 TABLE test t2 136 TABLE test t3 188 truncate performance_schema.events_waits_summary_global_by_event_name; diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result index df42b39c726..bf920a30af3 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result @@ -65,7 +65,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -270,13 +270,13 @@ 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 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -290,7 +290,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -300,7 +300,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 17 select concat(current_user(), " is connected") as status; @@ -336,13 +336,13 @@ 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 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -356,7 +356,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -366,7 +366,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 17 insert into test.t1 set a=201, b=1, c=1; @@ -438,13 +438,13 @@ 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 62 +wait/io/table/sql/handler 64 wait/lock/table/sql/handler 0 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -458,7 +458,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +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 execute dump_waits_table_lock; @@ -468,7 +468,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 18 +TABLE test t1 20 TABLE test t2 0 TABLE test t3 44 select concat(current_user(), " is connected") as status; @@ -509,13 +509,13 @@ 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 62 +wait/io/table/sql/handler 64 wait/lock/table/sql/handler 0 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -529,7 +529,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +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 execute dump_waits_table_lock; @@ -539,7 +539,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 18 +TABLE test t1 20 TABLE test t2 0 TABLE test t3 44 insert into test.t1 set a=301, b=1, c=1; @@ -623,13 +623,13 @@ 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 114 +wait/io/table/sql/handler 116 wait/lock/table/sql/handler 0 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -643,7 +643,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +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 execute dump_waits_table_lock; @@ -653,7 +653,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 33 +TABLE test t1 35 TABLE test t2 0 TABLE test t3 81 select concat(current_user(), " is connected") as status; @@ -699,13 +699,13 @@ 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 114 +wait/io/table/sql/handler 116 wait/lock/table/sql/handler 0 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -719,7 +719,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +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 execute dump_waits_table_lock; @@ -729,7 +729,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 33 +TABLE test t1 35 TABLE test t2 0 TABLE test t3 81 insert into test.t1 set a=401, b=1, c=1; @@ -825,13 +825,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -845,7 +845,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -855,7 +855,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -903,13 +903,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -923,7 +923,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -933,7 +933,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 flush tables; @@ -978,13 +978,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -998,7 +998,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1008,7 +1008,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 set global read_only=1; @@ -1054,13 +1054,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1074,7 +1074,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1084,7 +1084,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 "================== con1 disconnected ==================" @@ -1127,13 +1127,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1147,7 +1147,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1157,7 +1157,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 "================== con2 disconnected ==================" @@ -1199,13 +1199,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1219,7 +1219,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1229,7 +1229,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 "================== con3 disconnected ==================" @@ -1270,13 +1270,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1290,7 +1290,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1300,7 +1300,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 "================== con4 disconnected ==================" @@ -1340,13 +1340,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1360,7 +1360,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1370,7 +1370,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1411,13 +1411,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1431,7 +1431,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1441,7 +1441,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1482,13 +1482,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1502,7 +1502,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1512,7 +1512,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1553,13 +1553,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1573,7 +1573,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1583,7 +1583,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1624,13 +1624,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1644,7 +1644,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1654,7 +1654,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_global_by_event_name; diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result index 30b48d59253..d100f2a5e08 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result @@ -64,7 +64,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -269,13 +269,13 @@ 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 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -289,7 +289,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -299,7 +299,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 12 TABLE test t3 17 select concat(current_user(), " is connected") as status; @@ -335,13 +335,13 @@ 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 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -355,7 +355,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -365,7 +365,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 12 TABLE test t3 17 insert into test.t1 set a=201, b=1, c=1; @@ -437,13 +437,13 @@ 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 92 +wait/io/table/sql/handler 94 wait/lock/table/sql/handler 0 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -457,7 +457,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +TABLE test t1 20 13 7 13 2 5 0 TABLE test t2 30 20 10 20 4 6 0 TABLE test t3 44 29 15 29 6 9 0 execute dump_waits_table_lock; @@ -467,7 +467,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 18 +TABLE test t1 20 TABLE test t2 30 TABLE test t3 44 select concat(current_user(), " is connected") as status; @@ -508,13 +508,13 @@ 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 92 +wait/io/table/sql/handler 94 wait/lock/table/sql/handler 0 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -528,7 +528,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +TABLE test t1 20 13 7 13 2 5 0 TABLE test t2 30 20 10 20 4 6 0 TABLE test t3 44 29 15 29 6 9 0 execute dump_waits_table_lock; @@ -538,7 +538,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 18 +TABLE test t1 20 TABLE test t2 30 TABLE test t3 44 insert into test.t1 set a=301, b=1, c=1; @@ -622,13 +622,13 @@ 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 168 +wait/io/table/sql/handler 170 wait/lock/table/sql/handler 0 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -642,7 +642,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +TABLE test t1 35 23 12 23 3 9 0 TABLE test t2 54 36 18 36 6 12 0 TABLE test t3 81 54 27 54 9 18 0 execute dump_waits_table_lock; @@ -652,7 +652,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 33 +TABLE test t1 35 TABLE test t2 54 TABLE test t3 81 select concat(current_user(), " is connected") as status; @@ -698,13 +698,13 @@ 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 168 +wait/io/table/sql/handler 170 wait/lock/table/sql/handler 0 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -718,7 +718,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +TABLE test t1 35 23 12 23 3 9 0 TABLE test t2 54 36 18 36 6 12 0 TABLE test t3 81 54 27 54 9 18 0 execute dump_waits_table_lock; @@ -728,7 +728,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 33 +TABLE test t1 35 TABLE test t2 54 TABLE test t3 81 insert into test.t1 set a=401, b=1, c=1; @@ -824,13 +824,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -844,7 +844,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -854,7 +854,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -902,13 +902,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -922,7 +922,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -932,7 +932,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 flush tables; @@ -977,13 +977,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -997,7 +997,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1007,7 +1007,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 set global read_only=1; @@ -1053,13 +1053,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1073,7 +1073,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1083,7 +1083,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 "================== con1 disconnected ==================" @@ -1126,13 +1126,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1146,7 +1146,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1156,7 +1156,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 "================== con2 disconnected ==================" @@ -1198,13 +1198,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1218,7 +1218,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1228,7 +1228,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 "================== con3 disconnected ==================" @@ -1269,13 +1269,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1289,7 +1289,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1299,7 +1299,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 "================== con4 disconnected ==================" @@ -1339,13 +1339,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1359,7 +1359,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1369,7 +1369,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1410,13 +1410,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1430,7 +1430,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1440,7 +1440,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1481,13 +1481,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1501,7 +1501,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1511,7 +1511,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1552,13 +1552,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1572,7 +1572,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1582,7 +1582,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1623,13 +1623,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1643,7 +1643,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1653,7 +1653,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_global_by_event_name; diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result index 4804265562c..a5d046f154c 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result @@ -65,7 +65,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -270,13 +270,13 @@ 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 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -290,7 +290,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -300,7 +300,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 17 select concat(current_user(), " is connected") as status; @@ -336,13 +336,13 @@ 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 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -356,7 +356,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -366,7 +366,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 17 insert into test.t1 set a=201, b=1, c=1; @@ -438,13 +438,13 @@ 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 62 +wait/io/table/sql/handler 64 wait/lock/table/sql/handler 0 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -458,7 +458,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +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 execute dump_waits_table_lock; @@ -468,7 +468,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 18 +TABLE test t1 20 TABLE test t2 0 TABLE test t3 44 select concat(current_user(), " is connected") as status; @@ -509,13 +509,13 @@ 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 62 +wait/io/table/sql/handler 64 wait/lock/table/sql/handler 0 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -529,7 +529,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +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 execute dump_waits_table_lock; @@ -539,7 +539,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 18 +TABLE test t1 20 TABLE test t2 0 TABLE test t3 44 insert into test.t1 set a=301, b=1, c=1; @@ -623,13 +623,13 @@ 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 114 +wait/io/table/sql/handler 116 wait/lock/table/sql/handler 0 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -643,7 +643,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +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 execute dump_waits_table_lock; @@ -653,7 +653,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 33 +TABLE test t1 35 TABLE test t2 0 TABLE test t3 81 select concat(current_user(), " is connected") as status; @@ -699,13 +699,13 @@ 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 114 +wait/io/table/sql/handler 116 wait/lock/table/sql/handler 0 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -719,7 +719,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +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 execute dump_waits_table_lock; @@ -729,7 +729,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 33 +TABLE test t1 35 TABLE test t2 0 TABLE test t3 81 insert into test.t1 set a=401, b=1, c=1; @@ -825,13 +825,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -845,7 +845,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -855,7 +855,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -903,13 +903,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -923,7 +923,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -933,7 +933,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 flush tables; @@ -978,13 +978,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -998,7 +998,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1008,7 +1008,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 set global read_only=1; @@ -1054,13 +1054,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1074,7 +1074,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1084,7 +1084,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 "================== con1 disconnected ==================" @@ -1127,13 +1127,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1147,7 +1147,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1157,7 +1157,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 "================== con2 disconnected ==================" @@ -1199,13 +1199,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1219,7 +1219,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1229,7 +1229,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 "================== con3 disconnected ==================" @@ -1270,13 +1270,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1290,7 +1290,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1300,7 +1300,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 "================== con4 disconnected ==================" @@ -1340,13 +1340,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1360,7 +1360,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1370,7 +1370,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1411,13 +1411,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1431,7 +1431,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1441,7 +1441,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1482,13 +1482,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1502,7 +1502,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1512,7 +1512,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1553,13 +1553,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1573,7 +1573,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1583,7 +1583,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1624,13 +1624,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1644,7 +1644,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1654,7 +1654,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_global_by_event_name; diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result index 086957fa25e..413a566fefb 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result @@ -64,7 +64,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -269,13 +269,13 @@ 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 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -289,7 +289,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -299,7 +299,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 12 TABLE test t3 17 select concat(current_user(), " is connected") as status; @@ -335,13 +335,13 @@ 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 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -355,7 +355,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -365,7 +365,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 12 TABLE test t3 17 insert into test.t1 set a=201, b=1, c=1; @@ -437,13 +437,13 @@ 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 92 +wait/io/table/sql/handler 94 wait/lock/table/sql/handler 0 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -457,7 +457,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +TABLE test t1 20 13 7 13 2 5 0 TABLE test t2 30 20 10 20 4 6 0 TABLE test t3 44 29 15 29 6 9 0 execute dump_waits_table_lock; @@ -467,7 +467,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 18 +TABLE test t1 20 TABLE test t2 30 TABLE test t3 44 select concat(current_user(), " is connected") as status; @@ -508,13 +508,13 @@ 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 92 +wait/io/table/sql/handler 94 wait/lock/table/sql/handler 0 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -528,7 +528,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +TABLE test t1 20 13 7 13 2 5 0 TABLE test t2 30 20 10 20 4 6 0 TABLE test t3 44 29 15 29 6 9 0 execute dump_waits_table_lock; @@ -538,7 +538,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 18 +TABLE test t1 20 TABLE test t2 30 TABLE test t3 44 insert into test.t1 set a=301, b=1, c=1; @@ -622,13 +622,13 @@ 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 168 +wait/io/table/sql/handler 170 wait/lock/table/sql/handler 0 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -642,7 +642,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +TABLE test t1 35 23 12 23 3 9 0 TABLE test t2 54 36 18 36 6 12 0 TABLE test t3 81 54 27 54 9 18 0 execute dump_waits_table_lock; @@ -652,7 +652,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 33 +TABLE test t1 35 TABLE test t2 54 TABLE test t3 81 select concat(current_user(), " is connected") as status; @@ -698,13 +698,13 @@ 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 168 +wait/io/table/sql/handler 170 wait/lock/table/sql/handler 0 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -718,7 +718,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +TABLE test t1 35 23 12 23 3 9 0 TABLE test t2 54 36 18 36 6 12 0 TABLE test t3 81 54 27 54 9 18 0 execute dump_waits_table_lock; @@ -728,7 +728,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 33 +TABLE test t1 35 TABLE test t2 54 TABLE test t3 81 insert into test.t1 set a=401, b=1, c=1; @@ -824,13 +824,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -844,7 +844,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -854,7 +854,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -902,13 +902,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -922,7 +922,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -932,7 +932,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 flush tables; @@ -977,13 +977,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -997,7 +997,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1007,7 +1007,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 set global read_only=1; @@ -1053,13 +1053,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1073,7 +1073,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1083,7 +1083,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 "================== con1 disconnected ==================" @@ -1126,13 +1126,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1146,7 +1146,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1156,7 +1156,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 "================== con2 disconnected ==================" @@ -1198,13 +1198,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1218,7 +1218,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1228,7 +1228,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 "================== con3 disconnected ==================" @@ -1269,13 +1269,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1289,7 +1289,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1299,7 +1299,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 "================== con4 disconnected ==================" @@ -1339,13 +1339,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1359,7 +1359,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1369,7 +1369,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1410,13 +1410,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1430,7 +1430,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1440,7 +1440,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1481,13 +1481,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1501,7 +1501,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1511,7 +1511,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1552,13 +1552,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1572,7 +1572,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1582,7 +1582,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1623,13 +1623,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1643,7 +1643,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1653,7 +1653,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_global_by_event_name; 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 08356e894da..4a5e7aeede1 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 @@ -63,7 +63,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -246,7 +246,7 @@ a b c d "================== Step 3 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username status user2 not found @@ -256,27 +256,27 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 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 6 TABLE test t1 +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 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -290,7 +290,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -300,7 +300,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 17 select concat(current_user(), " is connected") as status; @@ -309,7 +309,7 @@ user2@localhost is connected "================== Step 4 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -320,31 +320,31 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 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 -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 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 6 TABLE test t1 +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 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -358,7 +358,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -368,7 +368,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 17 insert into test.t1 set a=201, b=1, c=1; @@ -413,7 +413,7 @@ a b c d "================== Step 5 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -424,31 +424,31 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 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 -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 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 6 TABLE test t1 +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 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -462,7 +462,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -472,7 +472,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 17 select concat(current_user(), " is connected") as status; @@ -481,7 +481,7 @@ user3@localhost is connected "================== Step 6 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -493,7 +493,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -501,7 +501,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -509,19 +509,19 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 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 6 TABLE test t1 +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 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -535,7 +535,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -545,7 +545,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 17 insert into test.t1 set a=301, b=1, c=1; @@ -597,7 +597,7 @@ a b c d "================== Step 7 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -609,7 +609,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -617,7 +617,7 @@ user3 localhost wait/io/table/sql/handler 52 user3 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -625,19 +625,19 @@ user3 wait/io/table/sql/handler 52 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 21 TABLE test t1 +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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -651,7 +651,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -661,7 +661,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 select concat(current_user(), " is connected") as status; @@ -670,7 +670,7 @@ user4@localhost is connected "================== Step 8 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -683,7 +683,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -693,7 +693,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -703,19 +703,19 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 21 TABLE test t1 +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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -729,7 +729,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -739,7 +739,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 insert into test.t1 set a=401, b=1, c=1; @@ -798,7 +798,7 @@ a b c d "================== Step 9 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -811,7 +811,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -821,7 +821,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -831,19 +831,19 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 21 TABLE test t1 +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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -857,7 +857,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -867,7 +867,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -878,7 +878,7 @@ unlock tables; "================== Step 10 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -891,7 +891,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -901,7 +901,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -911,19 +911,19 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 21 TABLE test t1 +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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -937,7 +937,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -947,7 +947,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 flush tables; @@ -955,7 +955,7 @@ flush tables; "================== Step 11 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -968,7 +968,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -978,7 +978,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -988,19 +988,19 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 21 TABLE test t1 +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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1014,7 +1014,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1024,7 +1024,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 set global read_only=1; @@ -1033,7 +1033,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -1046,7 +1046,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1056,7 +1056,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1066,19 +1066,19 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 21 TABLE test t1 +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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1092,7 +1092,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1102,7 +1102,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 "================== con1 disconnected ==================" @@ -1121,7 +1121,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1131,7 +1131,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1141,19 +1141,19 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 21 TABLE test t1 +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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1167,7 +1167,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1177,7 +1177,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 "================== con2 disconnected ==================" @@ -1195,7 +1195,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1205,7 +1205,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1215,19 +1215,19 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 21 TABLE test t1 +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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1241,7 +1241,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1251,7 +1251,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 "================== con3 disconnected ==================" @@ -1268,7 +1268,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1278,7 +1278,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1288,19 +1288,19 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 21 TABLE test t1 +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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1314,7 +1314,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1324,7 +1324,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 "================== con4 disconnected ==================" @@ -1340,7 +1340,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1350,7 +1350,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1360,19 +1360,19 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 21 TABLE test t1 +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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1386,7 +1386,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1396,7 +1396,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1413,7 +1413,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1423,7 +1423,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1433,19 +1433,19 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 21 TABLE test t1 +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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1459,7 +1459,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1469,7 +1469,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1496,7 +1496,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1506,19 +1506,19 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 21 TABLE test t1 +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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1532,7 +1532,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1542,7 +1542,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1579,19 +1579,19 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 21 TABLE test t1 +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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1605,7 +1605,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1615,7 +1615,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1656,15 +1656,15 @@ 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 75 +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 21 TABLE test t1 +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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1678,7 +1678,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1688,7 +1688,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 truncate performance_schema.events_waits_summary_global_by_event_name; @@ -1733,7 +1733,7 @@ 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 -wait/io/table/sql/handler 21 TABLE test t1 +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 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result index e60acb62ff7..25ba676993a 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -245,7 +245,7 @@ a b c d "================== Step 3 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username status user2 not found @@ -255,28 +255,28 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 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 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/io/table/sql/handler 12 TABLE test t2 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 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -290,7 +290,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -300,7 +300,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 12 TABLE test t3 17 select concat(current_user(), " is connected") as status; @@ -309,7 +309,7 @@ user2@localhost is connected "================== Step 4 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -320,32 +320,32 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 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 -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 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 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/io/table/sql/handler 12 TABLE test t2 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 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -359,7 +359,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -369,7 +369,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 12 TABLE test t3 17 insert into test.t1 set a=201, b=1, c=1; @@ -414,7 +414,7 @@ a b c d "================== Step 5 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -425,32 +425,32 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 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 -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 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 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/io/table/sql/handler 12 TABLE test t2 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 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -464,7 +464,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -474,7 +474,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 12 TABLE test t3 17 select concat(current_user(), " is connected") as status; @@ -483,7 +483,7 @@ user3@localhost is connected "================== Step 6 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -495,7 +495,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -503,7 +503,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -511,20 +511,20 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 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 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/io/table/sql/handler 12 TABLE test t2 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 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -538,7 +538,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -548,7 +548,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 12 TABLE test t3 17 insert into test.t1 set a=301, b=1, c=1; @@ -600,7 +600,7 @@ a b c d "================== Step 7 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -612,7 +612,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -620,7 +620,7 @@ user3 localhost wait/io/table/sql/handler 76 user3 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -628,20 +628,20 @@ user3 wait/io/table/sql/handler 76 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 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 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -655,7 +655,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -665,7 +665,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 select concat(current_user(), " is connected") as status; @@ -674,7 +674,7 @@ user4@localhost is connected "================== Step 8 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -687,7 +687,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -697,7 +697,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -707,20 +707,20 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 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 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -734,7 +734,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -744,7 +744,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 insert into test.t1 set a=401, b=1, c=1; @@ -803,7 +803,7 @@ a b c d "================== Step 9 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -816,7 +816,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -826,7 +826,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -836,20 +836,20 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 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 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -863,7 +863,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -873,7 +873,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -884,7 +884,7 @@ unlock tables; "================== Step 10 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -897,7 +897,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -907,7 +907,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -917,20 +917,20 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 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 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -944,7 +944,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -954,7 +954,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 flush tables; @@ -962,7 +962,7 @@ flush tables; "================== Step 11 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -975,7 +975,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -985,7 +985,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -995,20 +995,20 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 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 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1022,7 +1022,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1032,7 +1032,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 set global read_only=1; @@ -1041,7 +1041,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -1054,7 +1054,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1064,7 +1064,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1074,20 +1074,20 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 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 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1101,7 +1101,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1111,7 +1111,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 "================== con1 disconnected ==================" @@ -1130,7 +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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1140,7 +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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1150,20 +1150,20 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 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 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1177,7 +1177,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1187,7 +1187,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 "================== con2 disconnected ==================" @@ -1205,7 +1205,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1215,7 +1215,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1225,20 +1225,20 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 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 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1252,7 +1252,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1262,7 +1262,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 "================== con3 disconnected ==================" @@ -1279,7 +1279,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1289,7 +1289,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1299,20 +1299,20 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 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 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1326,7 +1326,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1336,7 +1336,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 "================== con4 disconnected ==================" @@ -1352,7 +1352,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1362,7 +1362,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1372,20 +1372,20 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 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 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1399,7 +1399,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1409,7 +1409,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1426,7 +1426,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1436,7 +1436,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1446,20 +1446,20 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 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 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1473,7 +1473,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1483,7 +1483,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1510,7 +1510,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1520,20 +1520,20 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 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 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1547,7 +1547,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1557,7 +1557,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1594,20 +1594,20 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 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 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1621,7 +1621,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1631,7 +1631,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1672,16 +1672,16 @@ 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 111 +wait/io/table/sql/handler 113 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 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1695,7 +1695,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1705,7 +1705,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 truncate performance_schema.events_waits_summary_global_by_event_name; @@ -1750,7 +1750,7 @@ 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 -wait/io/table/sql/handler 21 TABLE test t1 +wait/io/table/sql/handler 23 TABLE test t1 wait/io/table/sql/handler 36 TABLE test t2 wait/io/table/sql/handler 54 TABLE test t3 execute dump_waits_index_io; diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result index 5593fd8ec85..41292e5913e 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result @@ -63,7 +63,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -246,7 +246,7 @@ a b c d "================== Step 3 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username status user2 not found @@ -256,27 +256,27 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 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 6 TABLE test t1 +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 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -290,7 +290,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -300,7 +300,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 17 select concat(current_user(), " is connected") as status; @@ -309,7 +309,7 @@ user2@localhost is connected "================== Step 4 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -320,31 +320,31 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 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 -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 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 6 TABLE test t1 +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 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -358,7 +358,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -368,7 +368,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 17 insert into test.t1 set a=201, b=1, c=1; @@ -413,7 +413,7 @@ a b c d "================== Step 5 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -424,31 +424,31 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 62 +localhost wait/io/table/sql/handler 64 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 62 +wait/io/table/sql/handler 64 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 18 TABLE test t1 +wait/io/table/sql/handler 20 TABLE test t1 wait/io/table/sql/handler 44 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -462,7 +462,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +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 execute dump_waits_table_lock; @@ -472,7 +472,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 18 +TABLE test t1 20 TABLE test t2 0 TABLE test t3 44 select concat(current_user(), " is connected") as status; @@ -481,7 +481,7 @@ user3@localhost is connected "================== Step 6 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -493,7 +493,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -501,7 +501,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -509,19 +509,19 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 62 +localhost wait/io/table/sql/handler 64 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 62 +wait/io/table/sql/handler 64 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 18 TABLE test t1 +wait/io/table/sql/handler 20 TABLE test t1 wait/io/table/sql/handler 44 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -535,7 +535,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +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 execute dump_waits_table_lock; @@ -545,7 +545,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 18 +TABLE test t1 20 TABLE test t2 0 TABLE test t3 44 insert into test.t1 set a=301, b=1, c=1; @@ -597,7 +597,7 @@ a b c d "================== Step 7 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -609,7 +609,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -617,7 +617,7 @@ user3 localhost wait/io/table/sql/handler 52 user3 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -625,19 +625,19 @@ user3 wait/io/table/sql/handler 52 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 114 +localhost wait/io/table/sql/handler 116 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 114 +wait/io/table/sql/handler 116 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 33 TABLE test t1 +wait/io/table/sql/handler 35 TABLE test t1 wait/io/table/sql/handler 81 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -651,7 +651,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +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 execute dump_waits_table_lock; @@ -661,7 +661,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 33 +TABLE test t1 35 TABLE test t2 0 TABLE test t3 81 select concat(current_user(), " is connected") as status; @@ -670,7 +670,7 @@ user4@localhost is connected "================== Step 8 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -683,7 +683,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -693,7 +693,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -703,19 +703,19 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 114 +localhost wait/io/table/sql/handler 116 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 114 +wait/io/table/sql/handler 116 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 33 TABLE test t1 +wait/io/table/sql/handler 35 TABLE test t1 wait/io/table/sql/handler 81 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -729,7 +729,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +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 execute dump_waits_table_lock; @@ -739,7 +739,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 33 +TABLE test t1 35 TABLE test t2 0 TABLE test t3 81 insert into test.t1 set a=401, b=1, c=1; @@ -798,7 +798,7 @@ a b c d "================== Step 9 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -811,7 +811,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -821,7 +821,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -831,19 +831,19 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -857,7 +857,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -867,7 +867,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -878,7 +878,7 @@ unlock tables; "================== Step 10 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -891,7 +891,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -901,7 +901,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -911,19 +911,19 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -937,7 +937,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -947,7 +947,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 flush tables; @@ -955,7 +955,7 @@ flush tables; "================== Step 11 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -968,7 +968,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -978,7 +978,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -988,19 +988,19 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1014,7 +1014,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1024,7 +1024,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 set global read_only=1; @@ -1033,7 +1033,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -1046,7 +1046,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -1056,7 +1056,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -1066,19 +1066,19 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1092,7 +1092,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1102,7 +1102,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 "================== con1 disconnected ==================" @@ -1121,7 +1121,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -1131,7 +1131,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -1141,19 +1141,19 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1167,7 +1167,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1177,7 +1177,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 "================== con2 disconnected ==================" @@ -1195,7 +1195,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -1205,7 +1205,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -1215,19 +1215,19 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1241,7 +1241,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1251,7 +1251,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 "================== con3 disconnected ==================" @@ -1268,7 +1268,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -1278,7 +1278,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -1288,19 +1288,19 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1314,7 +1314,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1324,7 +1324,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 "================== con4 disconnected ==================" @@ -1340,7 +1340,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -1350,7 +1350,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -1360,19 +1360,19 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1386,7 +1386,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1396,7 +1396,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1413,7 +1413,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -1423,7 +1423,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -1433,19 +1433,19 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1459,7 +1459,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1469,7 +1469,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1496,7 +1496,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -1506,19 +1506,19 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1532,7 +1532,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1542,7 +1542,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1579,19 +1579,19 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1605,7 +1605,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1615,7 +1615,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1656,15 +1656,15 @@ 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 179 +wait/io/table/sql/handler 181 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1678,7 +1678,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1688,7 +1688,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_global_by_event_name; @@ -1733,7 +1733,7 @@ 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 -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 128 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 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result index 0fd700c86ac..fc7c523ed8c 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -245,7 +245,7 @@ a b c d "================== Step 3 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username status user2 not found @@ -255,28 +255,28 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 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 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/io/table/sql/handler 12 TABLE test t2 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 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -290,7 +290,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -300,7 +300,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 12 TABLE test t3 17 select concat(current_user(), " is connected") as status; @@ -309,7 +309,7 @@ user2@localhost is connected "================== Step 4 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -320,32 +320,32 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 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 -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 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 6 TABLE test t1 +wait/io/table/sql/handler 8 TABLE test t1 wait/io/table/sql/handler 12 TABLE test t2 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 4 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -359,7 +359,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -369,7 +369,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 12 TABLE test t3 17 insert into test.t1 set a=201, b=1, c=1; @@ -414,7 +414,7 @@ a b c d "================== Step 5 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -425,32 +425,32 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 92 +localhost wait/io/table/sql/handler 94 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 92 +wait/io/table/sql/handler 94 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 18 TABLE test t1 +wait/io/table/sql/handler 20 TABLE test t1 wait/io/table/sql/handler 30 TABLE test t2 wait/io/table/sql/handler 44 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -464,7 +464,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +TABLE test t1 20 13 7 13 2 5 0 TABLE test t2 30 20 10 20 4 6 0 TABLE test t3 44 29 15 29 6 9 0 execute dump_waits_table_lock; @@ -474,7 +474,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 18 +TABLE test t1 20 TABLE test t2 30 TABLE test t3 44 select concat(current_user(), " is connected") as status; @@ -483,7 +483,7 @@ user3@localhost is connected "================== Step 6 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -495,7 +495,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -503,7 +503,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -511,20 +511,20 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 92 +localhost wait/io/table/sql/handler 94 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 92 +wait/io/table/sql/handler 94 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 18 TABLE test t1 +wait/io/table/sql/handler 20 TABLE test t1 wait/io/table/sql/handler 30 TABLE test t2 wait/io/table/sql/handler 44 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -538,7 +538,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +TABLE test t1 20 13 7 13 2 5 0 TABLE test t2 30 20 10 20 4 6 0 TABLE test t3 44 29 15 29 6 9 0 execute dump_waits_table_lock; @@ -548,7 +548,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 18 +TABLE test t1 20 TABLE test t2 30 TABLE test t3 44 insert into test.t1 set a=301, b=1, c=1; @@ -600,7 +600,7 @@ a b c d "================== Step 7 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -612,7 +612,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -620,7 +620,7 @@ user3 localhost wait/io/table/sql/handler 76 user3 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -628,20 +628,20 @@ user3 wait/io/table/sql/handler 76 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 168 +localhost wait/io/table/sql/handler 170 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 168 +wait/io/table/sql/handler 170 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 33 TABLE test t1 +wait/io/table/sql/handler 35 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t2 wait/io/table/sql/handler 81 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -655,7 +655,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +TABLE test t1 35 23 12 23 3 9 0 TABLE test t2 54 36 18 36 6 12 0 TABLE test t3 81 54 27 54 9 18 0 execute dump_waits_table_lock; @@ -665,7 +665,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 33 +TABLE test t1 35 TABLE test t2 54 TABLE test t3 81 select concat(current_user(), " is connected") as status; @@ -674,7 +674,7 @@ user4@localhost is connected "================== Step 8 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -687,7 +687,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -697,7 +697,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -707,20 +707,20 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 168 +localhost wait/io/table/sql/handler 170 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 168 +wait/io/table/sql/handler 170 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 33 TABLE test t1 +wait/io/table/sql/handler 35 TABLE test t1 wait/io/table/sql/handler 54 TABLE test t2 wait/io/table/sql/handler 81 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -734,7 +734,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +TABLE test t1 35 23 12 23 3 9 0 TABLE test t2 54 36 18 36 6 12 0 TABLE test t3 81 54 27 54 9 18 0 execute dump_waits_table_lock; @@ -744,7 +744,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 33 +TABLE test t1 35 TABLE test t2 54 TABLE test t3 81 insert into test.t1 set a=401, b=1, c=1; @@ -803,7 +803,7 @@ a b c d "================== Step 9 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -816,7 +816,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -826,7 +826,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -836,20 +836,20 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -863,7 +863,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -873,7 +873,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -884,7 +884,7 @@ unlock tables; "================== Step 10 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -897,7 +897,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -907,7 +907,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -917,20 +917,20 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -944,7 +944,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -954,7 +954,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 flush tables; @@ -962,7 +962,7 @@ flush tables; "================== Step 11 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -975,7 +975,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -985,7 +985,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -995,20 +995,20 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1022,7 +1022,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1032,7 +1032,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 set global read_only=1; @@ -1041,7 +1041,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -1054,7 +1054,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -1064,7 +1064,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -1074,20 +1074,20 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1101,7 +1101,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1111,7 +1111,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 "================== con1 disconnected ==================" @@ -1130,7 +1130,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -1140,7 +1140,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -1150,20 +1150,20 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1177,7 +1177,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1187,7 +1187,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 "================== con2 disconnected ==================" @@ -1205,7 +1205,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -1215,7 +1215,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -1225,20 +1225,20 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1252,7 +1252,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1262,7 +1262,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 "================== con3 disconnected ==================" @@ -1279,7 +1279,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -1289,7 +1289,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -1299,20 +1299,20 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1326,7 +1326,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1336,7 +1336,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 "================== con4 disconnected ==================" @@ -1352,7 +1352,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -1362,7 +1362,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -1372,20 +1372,20 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1399,7 +1399,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1409,7 +1409,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1426,7 +1426,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -1436,7 +1436,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -1446,20 +1446,20 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1473,7 +1473,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1483,7 +1483,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1510,7 +1510,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -1520,20 +1520,20 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1547,7 +1547,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1557,7 +1557,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1594,20 +1594,20 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1621,7 +1621,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1631,7 +1631,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1672,16 +1672,16 @@ 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 263 +wait/io/table/sql/handler 265 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 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/io/table/sql/handler 128 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1695,7 +1695,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1705,7 +1705,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_global_by_event_name; @@ -1750,7 +1750,7 @@ 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 -wait/io/table/sql/handler 51 TABLE test t1 +wait/io/table/sql/handler 53 TABLE test t1 wait/io/table/sql/handler 84 TABLE test t2 wait/io/table/sql/handler 128 TABLE test t3 execute dump_waits_index_io; diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result index c4c98c1143f..210928a0c04 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result @@ -65,7 +65,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -248,7 +248,7 @@ a b c d "================== Step 3 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username status user2 not found @@ -258,25 +258,25 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -290,7 +290,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -300,7 +300,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 17 select concat(current_user(), " is connected") as status; @@ -309,7 +309,7 @@ user2@localhost is connected "================== Step 4 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -320,29 +320,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 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 -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -356,7 +356,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -366,7 +366,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 17 insert into test.t1 set a=201, b=1, c=1; @@ -411,7 +411,7 @@ a b c d "================== Step 5 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -422,29 +422,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 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 -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -458,7 +458,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -468,7 +468,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 17 select concat(current_user(), " is connected") as status; @@ -477,7 +477,7 @@ user3@localhost is connected "================== Step 6 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -489,7 +489,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -497,7 +497,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -505,17 +505,17 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -529,7 +529,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -539,7 +539,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 17 insert into test.t1 set a=301, b=1, c=1; @@ -591,7 +591,7 @@ a b c d "================== Step 7 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -603,7 +603,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -611,7 +611,7 @@ user3 localhost wait/io/table/sql/handler 52 user3 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -619,17 +619,17 @@ user3 wait/io/table/sql/handler 52 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -643,7 +643,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -653,7 +653,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 select concat(current_user(), " is connected") as status; @@ -662,7 +662,7 @@ user4@localhost is connected "================== Step 8 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -675,7 +675,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -685,7 +685,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -695,17 +695,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -719,7 +719,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -729,7 +729,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 insert into test.t1 set a=401, b=1, c=1; @@ -788,7 +788,7 @@ a b c d "================== Step 9 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -801,7 +801,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -811,7 +811,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -821,17 +821,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -845,7 +845,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -855,7 +855,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -866,7 +866,7 @@ unlock tables; "================== Step 10 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -879,7 +879,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -889,7 +889,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -899,17 +899,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -923,7 +923,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -933,7 +933,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 flush tables; @@ -941,7 +941,7 @@ flush tables; "================== Step 11 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -954,7 +954,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -964,7 +964,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -974,17 +974,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -998,7 +998,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1008,7 +1008,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 set global read_only=1; @@ -1017,7 +1017,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -1030,7 +1030,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1040,7 +1040,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1050,17 +1050,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1074,7 +1074,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1084,7 +1084,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 "================== con1 disconnected ==================" @@ -1103,7 +1103,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1113,7 +1113,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1123,17 +1123,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1147,7 +1147,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1157,7 +1157,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 "================== con2 disconnected ==================" @@ -1175,7 +1175,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1185,7 +1185,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1195,17 +1195,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1219,7 +1219,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1229,7 +1229,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 "================== con3 disconnected ==================" @@ -1246,7 +1246,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1256,7 +1256,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1266,17 +1266,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1290,7 +1290,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1300,7 +1300,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 "================== con4 disconnected ==================" @@ -1316,7 +1316,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1326,7 +1326,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1336,17 +1336,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1360,7 +1360,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1370,7 +1370,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1387,7 +1387,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1397,7 +1397,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1407,17 +1407,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1431,7 +1431,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1441,7 +1441,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1468,7 +1468,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1478,17 +1478,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1502,7 +1502,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1512,7 +1512,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1549,17 +1549,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 75 +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 75 +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 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1573,7 +1573,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1583,7 +1583,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1624,13 +1624,13 @@ 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 75 +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 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1644,7 +1644,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +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 execute dump_waits_table_lock; @@ -1654,7 +1654,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 0 TABLE test t3 54 truncate performance_schema.events_waits_summary_global_by_event_name; diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result index 3563e7bb366..9df65066d45 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result @@ -64,7 +64,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -247,7 +247,7 @@ a b c d "================== Step 3 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username status user2 not found @@ -257,25 +257,25 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -289,7 +289,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -299,7 +299,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 12 TABLE test t3 17 select concat(current_user(), " is connected") as status; @@ -308,7 +308,7 @@ user2@localhost is connected "================== Step 4 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -319,29 +319,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 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 -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -355,7 +355,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -365,7 +365,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 12 TABLE test t3 17 insert into test.t1 set a=201, b=1, c=1; @@ -410,7 +410,7 @@ a b c d "================== Step 5 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -421,29 +421,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 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 -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -457,7 +457,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -467,7 +467,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 12 TABLE test t3 17 select concat(current_user(), " is connected") as status; @@ -476,7 +476,7 @@ user3@localhost is connected "================== Step 6 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -488,7 +488,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -496,7 +496,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -504,17 +504,17 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -528,7 +528,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -538,7 +538,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 12 TABLE test t3 17 insert into test.t1 set a=301, b=1, c=1; @@ -590,7 +590,7 @@ a b c d "================== Step 7 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -602,7 +602,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -610,7 +610,7 @@ user3 localhost wait/io/table/sql/handler 76 user3 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -618,17 +618,17 @@ user3 wait/io/table/sql/handler 76 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 0 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -642,7 +642,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -652,7 +652,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 select concat(current_user(), " is connected") as status; @@ -661,7 +661,7 @@ user4@localhost is connected "================== Step 8 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -674,7 +674,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -684,7 +684,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -694,17 +694,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 0 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -718,7 +718,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -728,7 +728,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 insert into test.t1 set a=401, b=1, c=1; @@ -787,7 +787,7 @@ a b c d "================== Step 9 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -800,7 +800,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -810,7 +810,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -820,17 +820,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 0 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -844,7 +844,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -854,7 +854,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -865,7 +865,7 @@ unlock tables; "================== Step 10 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -878,7 +878,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -888,7 +888,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -898,17 +898,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 0 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -922,7 +922,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -932,7 +932,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 flush tables; @@ -940,7 +940,7 @@ flush tables; "================== Step 11 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -953,7 +953,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 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,7 +963,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -973,17 +973,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 0 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -997,7 +997,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1007,7 +1007,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 set global read_only=1; @@ -1016,7 +1016,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -1029,7 +1029,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1039,7 +1039,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1049,17 +1049,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 0 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1073,7 +1073,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1083,7 +1083,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 "================== con1 disconnected ==================" @@ -1102,7 +1102,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1112,7 +1112,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1122,17 +1122,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 0 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1146,7 +1146,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1156,7 +1156,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 "================== con2 disconnected ==================" @@ -1174,7 +1174,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1184,7 +1184,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1194,17 +1194,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 0 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1218,7 +1218,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1228,7 +1228,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 "================== con3 disconnected ==================" @@ -1245,7 +1245,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1255,7 +1255,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1265,17 +1265,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 0 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1289,7 +1289,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1299,7 +1299,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 "================== con4 disconnected ==================" @@ -1315,7 +1315,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1325,7 +1325,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1335,17 +1335,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 0 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1359,7 +1359,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1369,7 +1369,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1386,7 +1386,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 0 user2 localhost wait/lock/table/sql/handler 0 @@ -1396,7 +1396,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1406,17 +1406,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 0 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1430,7 +1430,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1440,7 +1440,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1467,7 +1467,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 0 user2 wait/lock/table/sql/handler 0 @@ -1477,17 +1477,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 0 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1501,7 +1501,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1511,7 +1511,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1548,17 +1548,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 111 +localhost wait/io/table/sql/handler 113 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 0 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1572,7 +1572,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1582,7 +1582,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1623,13 +1623,13 @@ 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 111 +wait/io/table/sql/handler 113 wait/lock/table/sql/handler 0 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 16 10 6 10 2 4 0 +TABLE test t1 NULL 18 12 6 12 2 4 0 TABLE test t1 index_b 1 1 0 1 0 0 0 TABLE test t1 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -1643,7 +1643,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 21 13 8 13 2 6 0 +TABLE test t1 23 15 8 15 2 6 0 TABLE test t2 36 24 12 24 4 8 0 TABLE test t3 54 36 18 36 6 12 0 execute dump_waits_table_lock; @@ -1653,7 +1653,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 21 +TABLE test t1 23 TABLE test t2 36 TABLE test t3 54 truncate performance_schema.events_waits_summary_global_by_event_name; diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result index 0cf5970111d..a9109fa42d2 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result @@ -65,7 +65,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -248,7 +248,7 @@ a b c d "================== Step 3 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username status user2 not found @@ -258,25 +258,25 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -290,7 +290,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -300,7 +300,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 17 select concat(current_user(), " is connected") as status; @@ -309,7 +309,7 @@ user2@localhost is connected "================== Step 4 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -320,29 +320,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 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 -localhost wait/io/table/sql/handler 23 +localhost wait/io/table/sql/handler 25 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 23 +wait/io/table/sql/handler 25 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -356,7 +356,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +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 execute dump_waits_table_lock; @@ -366,7 +366,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 0 TABLE test t3 17 insert into test.t1 set a=201, b=1, c=1; @@ -411,7 +411,7 @@ a b c d "================== Step 5 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -422,29 +422,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 62 +localhost wait/io/table/sql/handler 64 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 62 +wait/io/table/sql/handler 64 wait/lock/table/sql/handler 0 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -458,7 +458,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +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 execute dump_waits_table_lock; @@ -468,7 +468,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 18 +TABLE test t1 20 TABLE test t2 0 TABLE test t3 44 select concat(current_user(), " is connected") as status; @@ -477,7 +477,7 @@ user3@localhost is connected "================== Step 6 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -489,7 +489,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -497,7 +497,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -505,17 +505,17 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 62 +localhost wait/io/table/sql/handler 64 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 62 +wait/io/table/sql/handler 64 wait/lock/table/sql/handler 0 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -529,7 +529,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +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 execute dump_waits_table_lock; @@ -539,7 +539,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 18 +TABLE test t1 20 TABLE test t2 0 TABLE test t3 44 insert into test.t1 set a=301, b=1, c=1; @@ -591,7 +591,7 @@ a b c d "================== Step 7 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -603,7 +603,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -611,7 +611,7 @@ user3 localhost wait/io/table/sql/handler 52 user3 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -619,17 +619,17 @@ user3 wait/io/table/sql/handler 52 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 114 +localhost wait/io/table/sql/handler 116 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 114 +wait/io/table/sql/handler 116 wait/lock/table/sql/handler 0 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -643,7 +643,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +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 execute dump_waits_table_lock; @@ -653,7 +653,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 33 +TABLE test t1 35 TABLE test t2 0 TABLE test t3 81 select concat(current_user(), " is connected") as status; @@ -662,7 +662,7 @@ user4@localhost is connected "================== Step 8 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -675,7 +675,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 -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -685,7 +685,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -695,17 +695,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 114 +localhost wait/io/table/sql/handler 116 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 114 +wait/io/table/sql/handler 116 wait/lock/table/sql/handler 0 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -719,7 +719,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +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 execute dump_waits_table_lock; @@ -729,7 +729,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 33 +TABLE test t1 35 TABLE test t2 0 TABLE test t3 81 insert into test.t1 set a=401, b=1, c=1; @@ -788,7 +788,7 @@ a b c d "================== Step 9 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -801,7 +801,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -811,7 +811,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -821,17 +821,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -845,7 +845,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -855,7 +855,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -866,7 +866,7 @@ unlock tables; "================== Step 10 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -879,7 +879,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -889,7 +889,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -899,17 +899,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -923,7 +923,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -933,7 +933,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 flush tables; @@ -941,7 +941,7 @@ flush tables; "================== Step 11 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -954,7 +954,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -964,7 +964,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -974,17 +974,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -998,7 +998,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1008,7 +1008,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 set global read_only=1; @@ -1017,7 +1017,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 39 @@ -1030,7 +1030,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -1040,7 +1040,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -1050,17 +1050,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1074,7 +1074,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1084,7 +1084,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 "================== con1 disconnected ==================" @@ -1103,7 +1103,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -1113,7 +1113,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -1123,17 +1123,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1147,7 +1147,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1157,7 +1157,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 "================== con2 disconnected ==================" @@ -1175,7 +1175,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -1185,7 +1185,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -1195,17 +1195,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1219,7 +1219,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1229,7 +1229,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 "================== con3 disconnected ==================" @@ -1246,7 +1246,7 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -1256,7 +1256,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -1266,17 +1266,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1290,7 +1290,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1300,7 +1300,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 "================== con4 disconnected ==================" @@ -1316,7 +1316,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -1326,7 +1326,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -1336,17 +1336,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1360,7 +1360,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1370,7 +1370,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1387,7 +1387,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 23 +user1 localhost wait/io/table/sql/handler 25 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 39 user2 localhost wait/lock/table/sql/handler 0 @@ -1397,7 +1397,7 @@ user4 localhost wait/io/table/sql/handler 65 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -1407,17 +1407,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1431,7 +1431,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1441,7 +1441,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1468,7 +1468,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 -user1 wait/io/table/sql/handler 23 +user1 wait/io/table/sql/handler 25 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 39 user2 wait/lock/table/sql/handler 0 @@ -1478,17 +1478,17 @@ user4 wait/io/table/sql/handler 65 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1502,7 +1502,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1512,7 +1512,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1549,17 +1549,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 179 +localhost wait/io/table/sql/handler 181 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1573,7 +1573,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1583,7 +1583,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1624,13 +1624,13 @@ 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 179 +wait/io/table/sql/handler 181 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1644,7 +1644,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +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 execute dump_waits_table_lock; @@ -1654,7 +1654,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 0 TABLE test t3 128 truncate performance_schema.events_waits_summary_global_by_event_name; diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result index c94d2192f22..542b020f77a 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result @@ -64,7 +64,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -247,7 +247,7 @@ a b c d "================== Step 3 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username status user2 not found @@ -257,25 +257,25 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -289,7 +289,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -299,7 +299,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 12 TABLE test t3 17 select concat(current_user(), " is connected") as status; @@ -308,7 +308,7 @@ user2@localhost is connected "================== Step 4 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 0 @@ -319,29 +319,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 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 -localhost wait/io/table/sql/handler 35 +localhost wait/io/table/sql/handler 37 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 35 +wait/io/table/sql/handler 37 wait/lock/table/sql/handler 0 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 2 2 2 1 1 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 2 1 1 1 0 1 0 @@ -355,7 +355,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 6 3 3 3 1 2 0 +TABLE test t1 8 5 3 5 1 2 0 TABLE test t2 12 8 4 8 2 2 0 TABLE test t3 17 11 6 11 3 3 0 execute dump_waits_table_lock; @@ -365,7 +365,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 6 +TABLE test t1 8 TABLE test t2 12 TABLE test t3 17 insert into test.t1 set a=201, b=1, c=1; @@ -410,7 +410,7 @@ a b c d "================== Step 5 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -421,29 +421,29 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 92 +localhost wait/io/table/sql/handler 94 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 92 +wait/io/table/sql/handler 94 wait/lock/table/sql/handler 0 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -457,7 +457,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +TABLE test t1 20 13 7 13 2 5 0 TABLE test t2 30 20 10 20 4 6 0 TABLE test t3 44 29 15 29 6 9 0 execute dump_waits_table_lock; @@ -467,7 +467,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 18 +TABLE test t1 20 TABLE test t2 30 TABLE test t3 44 select concat(current_user(), " is connected") as status; @@ -476,7 +476,7 @@ user3@localhost is connected "================== Step 6 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -488,7 +488,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -496,7 +496,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -504,17 +504,17 @@ user3 wait/io/table/sql/handler 0 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 92 +localhost wait/io/table/sql/handler 94 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 92 +wait/io/table/sql/handler 94 wait/lock/table/sql/handler 0 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 13 8 5 8 2 3 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 4 2 2 2 0 2 0 @@ -528,7 +528,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 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 -TABLE test t1 18 11 7 11 2 5 0 +TABLE test t1 20 13 7 13 2 5 0 TABLE test t2 30 20 10 20 4 6 0 TABLE test t3 44 29 15 29 6 9 0 execute dump_waits_table_lock; @@ -538,7 +538,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 18 +TABLE test t1 20 TABLE test t2 30 TABLE test t3 44 insert into test.t1 set a=301, b=1, c=1; @@ -590,7 +590,7 @@ a b c d "================== Step 7 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -602,7 +602,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -610,7 +610,7 @@ user3 localhost wait/io/table/sql/handler 76 user3 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -618,17 +618,17 @@ user3 wait/io/table/sql/handler 76 user3 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 168 +localhost wait/io/table/sql/handler 170 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 168 +wait/io/table/sql/handler 170 wait/lock/table/sql/handler 0 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -642,7 +642,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +TABLE test t1 35 23 12 23 3 9 0 TABLE test t2 54 36 18 36 6 12 0 TABLE test t3 81 54 27 54 9 18 0 execute dump_waits_table_lock; @@ -652,7 +652,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 33 +TABLE test t1 35 TABLE test t2 54 TABLE test t3 81 select concat(current_user(), " is connected") as status; @@ -661,7 +661,7 @@ user4@localhost is connected "================== Step 8 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -674,7 +674,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 -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -684,7 +684,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -694,17 +694,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 168 +localhost wait/io/table/sql/handler 170 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 168 +wait/io/table/sql/handler 170 wait/lock/table/sql/handler 0 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 25 16 9 16 3 6 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 6 3 3 3 0 3 0 @@ -718,7 +718,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 3 3 0 3 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 33 21 12 21 3 9 0 +TABLE test t1 35 23 12 23 3 9 0 TABLE test t2 54 36 18 36 6 12 0 TABLE test t3 81 54 27 54 9 18 0 execute dump_waits_table_lock; @@ -728,7 +728,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 33 +TABLE test t1 35 TABLE test t2 54 TABLE test t3 81 insert into test.t1 set a=401, b=1, c=1; @@ -787,7 +787,7 @@ a b c d "================== Step 9 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -800,7 +800,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -810,7 +810,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -820,17 +820,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -844,7 +844,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -854,7 +854,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 lock tables test.t1 read, test.t2 read, test.t3 read; @@ -865,7 +865,7 @@ unlock tables; "================== Step 10 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -878,7 +878,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -888,7 +888,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -898,17 +898,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -922,7 +922,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -932,7 +932,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 flush tables; @@ -940,7 +940,7 @@ flush tables; "================== Step 11 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -953,7 +953,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -963,7 +963,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -973,17 +973,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -997,7 +997,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1007,7 +1007,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 set global read_only=1; @@ -1016,7 +1016,7 @@ set global read_only=0; "================== Step 12 ==================" call dump_thread(); username event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 username event_name count_star user2 wait/io/table/sql/handler 57 @@ -1029,7 +1029,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -1039,7 +1039,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -1049,17 +1049,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1073,7 +1073,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1083,7 +1083,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 "================== con1 disconnected ==================" @@ -1102,7 +1102,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -1112,7 +1112,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -1122,17 +1122,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1146,7 +1146,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1156,7 +1156,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 "================== con2 disconnected ==================" @@ -1174,7 +1174,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -1184,7 +1184,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -1194,17 +1194,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1218,7 +1218,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1228,7 +1228,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 "================== con3 disconnected ==================" @@ -1245,7 +1245,7 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -1255,7 +1255,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -1265,17 +1265,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1289,7 +1289,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1299,7 +1299,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 "================== con4 disconnected ==================" @@ -1315,7 +1315,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -1325,7 +1325,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -1335,17 +1335,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1359,7 +1359,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1369,7 +1369,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_thread_by_event_name; @@ -1386,7 +1386,7 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -user1 localhost wait/io/table/sql/handler 35 +user1 localhost wait/io/table/sql/handler 37 user1 localhost wait/lock/table/sql/handler 0 user2 localhost wait/io/table/sql/handler 57 user2 localhost wait/lock/table/sql/handler 0 @@ -1396,7 +1396,7 @@ user4 localhost wait/io/table/sql/handler 95 user4 localhost wait/lock/table/sql/handler 0 execute dump_waits_user; user event_name count_star -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -1406,17 +1406,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1430,7 +1430,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1440,7 +1440,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_account_by_event_name; @@ -1467,7 +1467,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 -user1 wait/io/table/sql/handler 35 +user1 wait/io/table/sql/handler 37 user1 wait/lock/table/sql/handler 0 user2 wait/io/table/sql/handler 57 user2 wait/lock/table/sql/handler 0 @@ -1477,17 +1477,17 @@ user4 wait/io/table/sql/handler 95 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1501,7 +1501,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1511,7 +1511,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_user_by_event_name; @@ -1548,17 +1548,17 @@ user4 wait/io/table/sql/handler 0 user4 wait/lock/table/sql/handler 0 execute dump_waits_host; host event_name count_star -localhost wait/io/table/sql/handler 263 +localhost wait/io/table/sql/handler 265 localhost wait/lock/table/sql/handler 0 execute dump_waits_global; event_name count_star -wait/io/table/sql/handler 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1572,7 +1572,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1582,7 +1582,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_by_host_by_event_name; @@ -1623,13 +1623,13 @@ 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 263 +wait/io/table/sql/handler 265 wait/lock/table/sql/handler 0 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 40 26 14 26 4 10 0 +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 index_cb 0 0 0 0 0 0 0 TABLE test t1 PRIMARY 8 4 4 4 0 4 0 @@ -1643,7 +1643,7 @@ TABLE test t3 index_cb 0 0 0 0 0 0 0 TABLE test t3 PRIMARY 4 4 0 4 0 0 0 execute dump_waits_table_io; object_type object_schema object_name count_star count_read count_write count_fetch count_insert count_update count_delete -TABLE test t1 51 33 18 33 4 14 0 +TABLE test t1 53 35 18 35 4 14 0 TABLE test t2 84 56 28 56 8 20 0 TABLE test t3 128 86 42 86 12 30 0 execute dump_waits_table_lock; @@ -1653,7 +1653,7 @@ 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 execute dump_objects_summary; object_type object_schema object_name count_star -TABLE test t1 51 +TABLE test t1 53 TABLE test t2 84 TABLE test t3 128 truncate performance_schema.events_waits_summary_global_by_event_name; diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result index 84074f4d0ce..ece0dadebd0 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result @@ -65,7 +65,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result index 413b70c17bd..956540b9327 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result @@ -64,7 +64,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result index dfa300a09ed..72f0240c6be 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result @@ -65,7 +65,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result index b4ca5202558..a93cc1b6499 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result @@ -64,7 +64,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result index 50aeea5363a..0e1b7032af6 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result @@ -63,7 +63,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result index eeea805e941..fb1fd8fb207 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result index ce9e0aeff85..f97272634b9 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result @@ -63,7 +63,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result index 2ecd7d56411..ddf8ef7bf9d 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result index 372ed695675..588a378024a 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result @@ -65,7 +65,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result index 3f1e78a46da..76c466d48cc 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result @@ -64,7 +64,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result index d88e8f4d49a..2450456355a 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result @@ -65,7 +65,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result index 7b90426f3f8..72b46a2820b 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result @@ -64,7 +64,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/threads_innodb,xtradb.rdiff b/mysql-test/suite/perfschema/r/threads_innodb,xtradb.rdiff new file mode 100644 index 00000000000..bfa17407049 --- /dev/null +++ b/mysql-test/suite/perfschema/r/threads_innodb,xtradb.rdiff @@ -0,0 +1,10 @@ +--- suite/perfschema/r/threads_innodb.result 2013-12-20 20:19:06.000000000 +0100 ++++ suite/perfschema/r/threads_innodb.reject 2014-05-06 13:08:05.000000000 +0200 +@@ -6,6 +6,7 @@ + GROUP BY name; + name type processlist_user processlist_host processlist_db processlist_command processlist_time processlist_state processlist_info parent_thread_id role instrumented + thread/innodb/io_handler_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES ++thread/innodb/lru_manager_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES + thread/innodb/page_cleaner_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES + thread/innodb/srv_error_monitor_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES + thread/innodb/srv_lock_timeout_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES diff --git a/mysql-test/suite/perfschema/r/threads_insert_delayed.result b/mysql-test/suite/perfschema/r/threads_insert_delayed.result index 07e625a4727..b3bcdc49f58 100644 --- a/mysql-test/suite/perfschema/r/threads_insert_delayed.result +++ b/mysql-test/suite/perfschema/r/threads_insert_delayed.result @@ -10,8 +10,6 @@ expect_1 INSERT INTO t2 SELECT thread_id FROM performance_schema.threads; INSERT DELAYED INTO t1 SET f1 = SLEEP(3); -Warnings: -Warning 1287 'INSERT DELAYED' is deprecated and will be removed in a future release. Please use INSERT instead SELECT name, type, instrumented, processlist_user, processlist_host FROM performance_schema.threads WHERE thread_id NOT IN (SELECT thread_id FROM t2); diff --git a/mysql-test/suite/perfschema/r/trigger_table_io.result b/mysql-test/suite/perfschema/r/trigger_table_io.result index df63e579d6f..e77e7d864f1 100644 --- a/mysql-test/suite/perfschema/r/trigger_table_io.result +++ b/mysql-test/suite/perfschema/r/trigger_table_io.result @@ -145,6 +145,8 @@ wait/io/table/sql/handler handler.cc: TABLE test t2 insert NULL wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL +wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL wait/io/table/sql/handler handler.cc: TABLE test t2 fetch NULL wait/io/table/sql/handler handler.cc: TABLE test t2 fetch NULL @@ -160,6 +162,9 @@ wait/io/table/sql/handler handler.cc: TABLE test t1 delete NULL wait/io/table/sql/handler handler.cc: TABLE test t2 insert NULL wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL +wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL +wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL wait/io/table/sql/handler handler.cc: TABLE test t2 fetch NULL wait/io/table/sql/handler handler.cc: TABLE test t2 fetch NULL diff --git a/mysql-test/suite/perfschema/r/update_order-3837.result b/mysql-test/suite/perfschema/r/update_order-3837.result new file mode 100644 index 00000000000..5d19d640a2f --- /dev/null +++ b/mysql-test/suite/perfschema/r/update_order-3837.result @@ -0,0 +1 @@ +UPDATE performance_schema.setup_instruments SET timed = 'YES' ORDER BY name; diff --git a/mysql-test/suite/perfschema/t/aggregate.test b/mysql-test/suite/perfschema/t/aggregate.test index 326c0e763d9..672737ae2a7 100644 --- a/mysql-test/suite/perfschema/t/aggregate.test +++ b/mysql-test/suite/perfschema/t/aggregate.test @@ -3,7 +3,6 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---source include/have_QC_Disabled.inc --echo "General cleanup" diff --git a/mysql-test/suite/perfschema/t/binlog_mix.test b/mysql-test/suite/perfschema/t/binlog_mix.test new file mode 100644 index 00000000000..ec2a6847beb --- /dev/null +++ b/mysql-test/suite/perfschema/t/binlog_mix.test @@ -0,0 +1,10 @@ +# Tests for PERFORMANCE_SCHEMA + +--source include/have_log_bin.inc +--source include/not_embedded.inc +--source include/have_perfschema.inc + +set binlog_format=mixed; + +--source ../include/binlog_common.inc + diff --git a/mysql-test/suite/perfschema/t/binlog_row.test b/mysql-test/suite/perfschema/t/binlog_row.test new file mode 100644 index 00000000000..825da373509 --- /dev/null +++ b/mysql-test/suite/perfschema/t/binlog_row.test @@ -0,0 +1,10 @@ +# Tests for PERFORMANCE_SCHEMA + +--source include/have_log_bin.inc +--source include/not_embedded.inc +--source include/have_perfschema.inc + +set binlog_format=row; + +--source ../include/binlog_common.inc + diff --git a/mysql-test/suite/perfschema/t/binlog_stmt.test b/mysql-test/suite/perfschema/t/binlog_stmt.test new file mode 100644 index 00000000000..463bba0ec22 --- /dev/null +++ b/mysql-test/suite/perfschema/t/binlog_stmt.test @@ -0,0 +1,11 @@ +# Tests for PERFORMANCE_SCHEMA + +--source include/have_log_bin.inc +--source include/not_embedded.inc +--source include/have_perfschema.inc + +set binlog_format=statement; +call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); + +--source ../include/binlog_common.inc + diff --git a/mysql-test/suite/perfschema/t/connect_attrs.test b/mysql-test/suite/perfschema/t/connect_attrs.test index 1dd5a15cbdd..850d9ddd248 100644 --- a/mysql-test/suite/perfschema/t/connect_attrs.test +++ b/mysql-test/suite/perfschema/t/connect_attrs.test @@ -68,6 +68,15 @@ SELECT COUNT(DISTINCT PROCESSLIST_ID) connection default; disconnect non_privileged_user; +grant select on performance_schema.* to wl5924@localhost; +change_user wl5924; +SELECT SUM(ISNULL(ATTR_VALUE)), COUNT(*) + FROM performance_schema.session_account_connect_attrs + WHERE ATTR_NAME IN ('_os', '_client_name', '_pid', + '_client_version', '_platform', 'program_name') + AND PROCESSLIST_ID = CONNECTION_ID(); +change_user root,,test; + DROP USER wl5924@localhost; # Wait till all disconnects are completed diff --git a/mysql-test/suite/perfschema/t/event_aggregate.test b/mysql-test/suite/perfschema/t/event_aggregate.test index 2f49fc40190..372cda050ee 100644 --- a/mysql-test/suite/perfschema/t/event_aggregate.test +++ b/mysql-test/suite/perfschema/t/event_aggregate.test @@ -4,4 +4,3 @@ --source ../include/event_aggregate_setup.inc --source ../include/event_aggregate_load.inc --source ../include/event_aggregate_cleanup.inc ---source include/have_QC_Disabled.inc diff --git a/mysql-test/suite/perfschema/t/event_aggregate_no_a.test b/mysql-test/suite/perfschema/t/event_aggregate_no_a.test index 2f49fc40190..372cda050ee 100644 --- a/mysql-test/suite/perfschema/t/event_aggregate_no_a.test +++ b/mysql-test/suite/perfschema/t/event_aggregate_no_a.test @@ -4,4 +4,3 @@ --source ../include/event_aggregate_setup.inc --source ../include/event_aggregate_load.inc --source ../include/event_aggregate_cleanup.inc ---source include/have_QC_Disabled.inc diff --git a/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test b/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test index 2f49fc40190..372cda050ee 100644 --- a/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test +++ b/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test @@ -4,4 +4,3 @@ --source ../include/event_aggregate_setup.inc --source ../include/event_aggregate_load.inc --source ../include/event_aggregate_cleanup.inc ---source include/have_QC_Disabled.inc diff --git a/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test b/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test index 2f49fc40190..372cda050ee 100644 --- a/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test +++ b/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test @@ -4,4 +4,3 @@ --source ../include/event_aggregate_setup.inc --source ../include/event_aggregate_load.inc --source ../include/event_aggregate_cleanup.inc ---source include/have_QC_Disabled.inc diff --git a/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test b/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test index 2f49fc40190..372cda050ee 100644 --- a/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test +++ b/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test @@ -4,4 +4,3 @@ --source ../include/event_aggregate_setup.inc --source ../include/event_aggregate_load.inc --source ../include/event_aggregate_cleanup.inc ---source include/have_QC_Disabled.inc diff --git a/mysql-test/suite/perfschema/t/event_aggregate_no_h.test b/mysql-test/suite/perfschema/t/event_aggregate_no_h.test index 2f49fc40190..372cda050ee 100644 --- a/mysql-test/suite/perfschema/t/event_aggregate_no_h.test +++ b/mysql-test/suite/perfschema/t/event_aggregate_no_h.test @@ -4,4 +4,3 @@ --source ../include/event_aggregate_setup.inc --source ../include/event_aggregate_load.inc --source ../include/event_aggregate_cleanup.inc ---source include/have_QC_Disabled.inc diff --git a/mysql-test/suite/perfschema/t/event_aggregate_no_u.test b/mysql-test/suite/perfschema/t/event_aggregate_no_u.test index 2f49fc40190..372cda050ee 100644 --- a/mysql-test/suite/perfschema/t/event_aggregate_no_u.test +++ b/mysql-test/suite/perfschema/t/event_aggregate_no_u.test @@ -4,4 +4,3 @@ --source ../include/event_aggregate_setup.inc --source ../include/event_aggregate_load.inc --source ../include/event_aggregate_cleanup.inc ---source include/have_QC_Disabled.inc diff --git a/mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test b/mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test index 2f49fc40190..372cda050ee 100644 --- a/mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test +++ b/mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test @@ -4,4 +4,3 @@ --source ../include/event_aggregate_setup.inc --source ../include/event_aggregate_load.inc --source ../include/event_aggregate_cleanup.inc ---source include/have_QC_Disabled.inc diff --git a/mysql-test/suite/perfschema/t/func_mutex.test b/mysql-test/suite/perfschema/t/func_mutex.test index 3b0803eaedb..ca1feb68091 100644 --- a/mysql-test/suite/perfschema/t/func_mutex.test +++ b/mysql-test/suite/perfschema/t/func_mutex.test @@ -19,7 +19,7 @@ flush status; # Make sure objects are instrumented select NAME from performance_schema.mutex_instances - where NAME = 'wait/synch/mutex/sql/LOCK_open'; + where NAME = 'wait/synch/mutex/sql/TABLE_SHARE::tdc.LOCK_table_share' GROUP BY NAME; select NAME from performance_schema.rwlock_instances where NAME = 'wait/synch/rwlock/sql/LOCK_grant'; @@ -49,18 +49,18 @@ SELECT * FROM t1 WHERE id = 1; SET @before_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long - WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_table_cache')); + WHERE (EVENT_NAME = 'wait/synch/mutex/sql/TABLE_SHARE::tdc.LOCK_table_share')); SELECT * FROM t1; SET @after_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long - WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_table_cache')); + WHERE (EVENT_NAME = 'wait/synch/mutex/sql/TABLE_SHARE::tdc.LOCK_table_share')); SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_timed; UPDATE performance_schema.setup_instruments SET enabled = 'NO' -WHERE NAME = 'wait/synch/mutex/sql/LOCK_table_cache'; +WHERE NAME = 'wait/synch/mutex/sql/TABLE_SHARE::tdc.LOCK_table_share'; TRUNCATE TABLE performance_schema.events_waits_history_long; TRUNCATE TABLE performance_schema.events_waits_history; @@ -70,13 +70,13 @@ SELECT * FROM t1 WHERE id = 1; SET @before_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long - WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_table_cache')); + WHERE (EVENT_NAME = 'wait/synch/mutex/sql/TABLE_SHARE::tdc.LOCK_table_share')); SELECT * FROM t1; SET @after_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long - WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_table_cache')); + WHERE (EVENT_NAME = 'wait/synch/mutex/sql/TABLE_SHARE::tdc.LOCK_table_share')); SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_timed; @@ -88,38 +88,38 @@ TRUNCATE TABLE performance_schema.events_waits_history_long; TRUNCATE TABLE performance_schema.events_waits_history; TRUNCATE TABLE performance_schema.events_waits_current; -SELECT * FROM t1 WHERE id = 1; +show variables like "%not_found%"; SET @before_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long - WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); + WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash')); -SELECT * FROM t1; +show variables like "%not_found%"; SET @after_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long - WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); + WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash')); SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_rw_timed; UPDATE performance_schema.setup_instruments SET enabled = 'NO' -WHERE NAME = 'wait/synch/rwlock/sql/LOCK_grant'; +WHERE NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash'; TRUNCATE TABLE performance_schema.events_waits_history_long; TRUNCATE TABLE performance_schema.events_waits_history; TRUNCATE TABLE performance_schema.events_waits_current; -SELECT * FROM t1 WHERE id = 1; +show variables like "%not_found%"; SET @before_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long - WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); + WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash')); -SELECT * FROM t1; +show variables like "%not_found%"; SET @after_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long - WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); + WHERE (EVENT_NAME = 'LOCK_system_variables_hash')); SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_rw_timed; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test index 280ee9bd8a4..a96ccf86315 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test @@ -26,7 +26,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -47,5 +47,5 @@ disconnect con3; revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test index bff1adf2ab2..f99cbc80577 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test @@ -24,7 +24,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -42,5 +42,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test index eccd1b2b1dc..4bf041b1ada 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test @@ -28,7 +28,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -49,5 +49,5 @@ disconnect con3; revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test index 3ff01cbaaf2..2f5f12fe0ab 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test @@ -26,7 +26,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -44,5 +44,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test index 3a052ba1227..9931fa5ffba 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test @@ -26,7 +26,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -47,5 +47,5 @@ disconnect con3; revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test index be883c22098..b46661c6852 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test @@ -24,7 +24,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -42,5 +42,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test index 4bf00f0dcf2..283d3a5841d 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test @@ -27,7 +27,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -50,5 +50,5 @@ revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test index 9259a939d59..eb69c2a5365 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test @@ -24,7 +24,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -42,5 +42,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin-master.opt deleted file mode 100644 index 3536d102387..00000000000 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin-master.opt +++ /dev/null @@ -1,2 +0,0 @@ -$PLUGIN_AUTH_OPT -$PLUGIN_AUTH_LOAD diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test index 769be301b18..da2a2bbc725 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test @@ -29,7 +29,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; uninstall plugin test_plugin_server; --disable_query_log @@ -48,8 +48,8 @@ connect (con3,"127.0.0.1",plug,plug_dest,test,$MASTER_MYPORT,,,auth_test_plugin) --connection default --source ../include/hostcache_dump.inc ---replace_result $PLUGIN_AUTH PLUGIN_AUTH -eval install plugin test_plugin_server soname '$PLUGIN_AUTH'; +--replace_result $AUTH_TEST_PLUGIN_SO PLUGIN_AUTH +eval install plugin test_plugin_server soname '$AUTH_TEST_PLUGIN_SO'; --disable_query_log --error ER_ACCESS_DENIED_ERROR @@ -85,5 +85,6 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv4.example.com' DROP USER 'plug'@'santa.claus.ipv4.example.com'; DROP USER 'plug_dest'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; +delete from mysql.plugin where name='test_plugin_server'; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test index 612efd18a82..7c89aa3d44e 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test @@ -31,7 +31,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply"; --disable_query_log --error ER_HANDSHAKE_ERROR @@ -93,7 +93,7 @@ connect (con3b,"127.0.0.1",quota,,test,$MASTER_MYPORT,); --source ../include/hostcache_dump.inc --connection default -set global debug= "-d,native_password_bad_reply"; +set global debug_dbug= "-d,native_password_bad_reply"; --disable_query_log connect (con4,"127.0.0.1",quota,,test,$MASTER_MYPORT,); @@ -102,7 +102,7 @@ select "Valid connection should reset SUM_CONNECT_ERROR counter" as message; --enable_query_log --connection default -set global debug= "+d,native_password_bad_reply"; +set global debug_dbug= "+d,native_password_bad_reply"; --connection default --source ../include/hostcache_dump.inc @@ -154,5 +154,5 @@ revoke select on test.* from 'quota'@'santa.claus.ipv4.example.com'; drop user 'quota'@'santa.claus.ipv4.example.com'; set global max_connect_errors = @saved_max_connect_errors; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test index ffc12628f90..4766dbef778 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test @@ -23,7 +23,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_format_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_format_ipv4"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -41,5 +41,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con-master.opt new file mode 100644 index 00000000000..87ad0bc3f2d --- /dev/null +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con-master.opt @@ -0,0 +1 @@ +--max-user-connections=1024 diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test index 0f84ffa371f..3bf5ef3b68d 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test @@ -17,6 +17,7 @@ --source ../include/hostcache_set_state.inc select @@global.max_connections into @saved_max_connections; +select @@global.max_user_connections into @saved_max_user_connections; create user 'quota'@'santa.claus.ipv4.example.com'; grant select on test.* to 'quota'@'santa.claus.ipv4.example.com'; @@ -29,7 +30,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; connect (con2a,"127.0.0.1",quota,,test,$MASTER_MYPORT,); select "Con2a is alive"; @@ -237,9 +238,10 @@ disconnect con5b; --source ../include/wait_for_pfs_thread_count.inc set global max_connections = @saved_max_connections; +set global max_user_connections = @saved_max_user_connections; # revoke all privileges on test.* from 'quota'@'santa.claus.ipv4.example.com'; drop user 'quota'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test index fdd8890ca62..bce65b61cfc 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test @@ -27,7 +27,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -45,7 +45,7 @@ disconnect con3; --connection default --source ../include/hostcache_dump.inc -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; connect (con4,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con4 is alive"; @@ -68,5 +68,5 @@ revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'192.0.2.4'; drop user 'root'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test index 749afe3cd28..6152399503b 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test @@ -24,7 +24,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -42,7 +42,7 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -60,5 +60,5 @@ connect (con5,"127.0.0.1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test index ebce919b82d..52b696831af 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test @@ -26,7 +26,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -47,5 +47,5 @@ disconnect con3; revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test index 686bb7ed5b8..72bb7fac6af 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test @@ -24,7 +24,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -42,5 +42,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test index ecce34283f5..b39f3478146 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test @@ -28,7 +28,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; --disable_query_log --error ER_ACCESS_DENIED_ERROR @@ -81,5 +81,5 @@ connect (con2f,"127.0.0.1",user_with,wrong_password,test,$MASTER_MYPORT,); drop user 'user_with'@'santa.claus.ipv4.example.com'; drop user 'user_without'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test index e2994d9ebcf..de58219d490 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test @@ -29,7 +29,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; --disable_query_log --error ER_ACCESS_DENIED_ERROR @@ -66,5 +66,5 @@ connect (con2d,"127.0.0.1",user_ssl_x509,good_password,test,$MASTER_MYPORT,,SSL) drop user 'user_ssl'@'santa.claus.ipv4.example.com'; drop user 'user_ssl_x509'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test index 225db44cb10..ae58f4089ed 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test @@ -27,7 +27,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again"; connect (con2,"::1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -48,5 +48,5 @@ disconnect con3; revoke select on test.* from 'root'@'2001:db8::6:6'; drop user 'root'@'2001:db8::6:6'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test index f2c640ab75f..8c408b160a6 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test @@ -25,7 +25,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -43,5 +43,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test index 360b87ea622..ccd0ae383ee 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test @@ -29,7 +29,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; connect (con2,"::1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -50,5 +50,5 @@ disconnect con3; revoke select on test.* from 'root'@'2001:db8::6:6'; drop user 'root'@'2001:db8::6:6'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test index 901dc0d6426..72d5d693a1b 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test @@ -27,7 +27,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -45,5 +45,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test index 84c5f3065a7..c253e4b77d5 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test @@ -27,7 +27,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; connect (con2,"::1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -48,5 +48,5 @@ disconnect con3; revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test index 2e656bab761..096b4b11eb4 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test @@ -21,7 +21,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -39,5 +39,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test index 2966c75d2b1..575dab9a337 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test @@ -28,7 +28,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; connect (con2,"::1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -51,5 +51,5 @@ revoke select on test.* from 'root'@'2001:db8::6:6'; drop user 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'2001:db8::6:6'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test index 588c6446a6d..f6e5fa118df 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test @@ -25,7 +25,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -43,5 +43,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin-master.opt index cf9f065605a..a0a6079ec16 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin-master.opt +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin-master.opt @@ -1,3 +1 @@ --bind-addr=:: -$PLUGIN_AUTH_OPT -$PLUGIN_AUTH_LOAD diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test index dd1fbe23b77..0e0e900405a 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test @@ -30,7 +30,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; uninstall plugin test_plugin_server; --disable_query_log @@ -49,8 +49,8 @@ connect (con3,"::1",plug,plug_dest,test,$MASTER_MYPORT,,,auth_test_plugin); --connection default --source ../include/hostcache_dump.inc ---replace_result $PLUGIN_AUTH PLUGIN_AUTH -eval install plugin test_plugin_server soname '$PLUGIN_AUTH'; +--replace_result $AUTH_TEST_PLUGIN_SO PLUGIN_AUTH +eval install plugin test_plugin_server soname '$AUTH_TEST_PLUGIN_SO'; --disable_query_log --error ER_ACCESS_DENIED_ERROR @@ -86,5 +86,6 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv6.example.com' DROP USER 'plug'@'santa.claus.ipv6.example.com'; DROP USER 'plug_dest'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; +delete from mysql.plugin where name='test_plugin_server'; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test index e6d2c168a16..9d4707dc027 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test @@ -32,7 +32,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply"; --disable_query_log --error ER_HANDSHAKE_ERROR @@ -94,7 +94,7 @@ connect (con3b,"::1",quota,,test,$MASTER_MYPORT,); --source ../include/hostcache_dump.inc --connection default -set global debug= "-d,native_password_bad_reply"; +set global debug_dbug= "-d,native_password_bad_reply"; --disable_query_log connect (con4,"::1",quota,,test,$MASTER_MYPORT,); @@ -103,7 +103,7 @@ select "Valid connection should reset SUM_CONNECT_ERROR counter" as message; --enable_query_log --connection default -set global debug= "+d,native_password_bad_reply"; +set global debug_dbug= "+d,native_password_bad_reply"; --connection default --source ../include/hostcache_dump.inc @@ -155,5 +155,5 @@ revoke select on test.* from 'quota'@'santa.claus.ipv6.example.com'; drop user 'quota'@'santa.claus.ipv6.example.com'; set global max_connect_errors = @saved_max_connect_errors; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con-master.opt index a0a6079ec16..143ad44c2f2 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con-master.opt +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con-master.opt @@ -1 +1,2 @@ --bind-addr=:: +--max-user-connections=1024 diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test index dbd46be8110..d4adc3e0d00 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test @@ -18,6 +18,7 @@ --source ../include/hostcache_set_state.inc select @@global.max_connections into @saved_max_connections; +select @@global.max_user_connections into @saved_max_user_connections; create user 'quota'@'santa.claus.ipv6.example.com'; grant select on test.* to 'quota'@'santa.claus.ipv6.example.com'; @@ -30,7 +31,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; connect (con2a,"::1",quota,,test,$MASTER_MYPORT,); select "Con2a is alive"; @@ -219,9 +220,10 @@ disconnect con5b; --source ../include/wait_for_pfs_thread_count.inc set global max_connections = @saved_max_connections; +set global max_user_connections = @saved_max_user_connections; # revoke all privileges on test.* from 'quota'@'santa.claus.ipv6.example.com'; drop user 'quota'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test index 45aaa26fadc..e396dbbad3c 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test @@ -28,7 +28,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; connect (con2,"::1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -46,7 +46,7 @@ disconnect con3; --connection default --source ../include/hostcache_dump.inc -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; connect (con4,"::1",root,,test,$MASTER_MYPORT,); select "Con4 is alive"; @@ -69,5 +69,5 @@ revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'2001:db8::6:6'; drop user 'root'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test index 856efe48c0b..cc7eb0b566f 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test @@ -25,7 +25,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -43,7 +43,7 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -61,5 +61,5 @@ connect (con5,"::1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test index 17fb0d25737..80f07989212 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test @@ -27,7 +27,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; connect (con2,"::1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -48,5 +48,5 @@ disconnect con3; revoke select on test.* from 'root'@'2001:db8::6:6'; drop user 'root'@'2001:db8::6:6'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test index fe4eb798bc7..0d11e433b58 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test @@ -25,7 +25,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -43,5 +43,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test index 19e21fbd068..6dd33b9bb5b 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test @@ -26,7 +26,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; --disable_query_log --error ER_ACCESS_DENIED_ERROR @@ -79,5 +79,5 @@ connect (con2f,"::1",user_with,wrong_password,test,$MASTER_MYPORT,); drop user 'user_with'@'santa.claus.ipv6.example.com'; drop user 'user_without'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test index 896a646ef22..2b30a4eaf41 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test @@ -30,7 +30,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; --disable_query_log --error ER_ACCESS_DENIED_ERROR @@ -67,5 +67,5 @@ connect (con2d,"::1",user_ssl_x509,good_password,test,$MASTER_MYPORT,,SSL); drop user 'user_ssl'@'santa.claus.ipv6.example.com'; drop user 'user_ssl_x509'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_peer_addr.test b/mysql-test/suite/perfschema/t/hostcache_peer_addr.test index ca53148d359..9e5c88b8bd5 100644 --- a/mysql-test/suite/perfschema/t/hostcache_peer_addr.test +++ b/mysql-test/suite/perfschema/t/hostcache_peer_addr.test @@ -21,7 +21,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_error"; +set global debug_dbug= "+d,vio_peer_addr_error"; --disable_query_log --error ER_BAD_HOST_ERROR @@ -41,7 +41,7 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); show global status like "connection_errors_%"; --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; flush status; show global status like "connection_errors_%"; diff --git a/mysql-test/suite/perfschema/t/innodb_table_io.test b/mysql-test/suite/perfschema/t/innodb_table_io.test index b3c78010731..3f187c01b6e 100644 --- a/mysql-test/suite/perfschema/t/innodb_table_io.test +++ b/mysql-test/suite/perfschema/t/innodb_table_io.test @@ -2,6 +2,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc +--source include/have_innodb.inc --source ../include/table_io_setup_helper.inc let $engine_type= InnoDB; diff --git a/mysql-test/suite/perfschema/t/misc.test b/mysql-test/suite/perfschema/t/misc.test index b7e714a6271..af19e8db51d 100644 --- a/mysql-test/suite/perfschema/t/misc.test +++ b/mysql-test/suite/perfschema/t/misc.test @@ -3,6 +3,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc +--source include/have_innodb.inc # # Bug#12790483 OBJECTS_SUMMARY_GLOBAL_BY_TYPE AND RENAME TABLE @@ -77,7 +78,7 @@ LIMIT 1; # Bug#45088 Should not be able to create tables of engine PERFORMANCE_SCHEMA # ---error ER_WRONG_PERFSCHEMA_USAGE +--error ER_CANT_CREATE_TABLE create table test.t1(a int) engine=performance_schema; # The table should not appear in OBJECTS_SUMMARY_GLOBAL_BY_TYPE @@ -89,7 +90,7 @@ SELECT object_schema, object_name FROM performance_schema.objects_summary_global # Bug#44897 Performance Schema: can create a ghost table in another database # ---error ER_WRONG_PERFSCHEMA_USAGE +--error ER_CANT_CREATE_TABLE create table test.t1 like performance_schema.events_waits_current; # The table should not appear in OBJECTS_SUMMARY_GLOBAL_BY_TYPE diff --git a/mysql-test/suite/perfschema/t/myisam_file_io.opt b/mysql-test/suite/perfschema/t/myisam_file_io.opt index f2e233bd4ab..5bec10ab266 100644 --- a/mysql-test/suite/perfschema/t/myisam_file_io.opt +++ b/mysql-test/suite/perfschema/t/myisam_file_io.opt @@ -1 +1 @@ ---performance_schema_events_waits_history_long_size=5000 +--loose-performance_schema_events_waits_history_long_size=5000 diff --git a/mysql-test/suite/perfschema/t/myisam_file_io.test b/mysql-test/suite/perfschema/t/myisam_file_io.test index 786ae88e8b9..3b6a1369ab5 100644 --- a/mysql-test/suite/perfschema/t/myisam_file_io.test +++ b/mysql-test/suite/perfschema/t/myisam_file_io.test @@ -47,6 +47,7 @@ select event_name, from performance_schema.events_waits_history_long where operation not like "tell" and event_name like "wait/io/file/myisam/%" + having short_name <> "" order by thread_id, event_id; # In case of failures, this will tell if file io are lost. diff --git a/mysql-test/suite/perfschema/t/nesting.test b/mysql-test/suite/perfschema/t/nesting.test index 4535e0e04f7..21e7260222a 100644 --- a/mysql-test/suite/perfschema/t/nesting.test +++ b/mysql-test/suite/perfschema/t/nesting.test @@ -7,7 +7,6 @@ --source include/not_windows.inc --source ../include/no_protocol.inc --source ../include/wait_for_pfs_thread_count.inc ---source include/have_QC_Disabled.inc --disable_query_log diff --git a/mysql-test/suite/perfschema/t/no_threads-master.opt b/mysql-test/suite/perfschema/t/no_threads-master.opt index 4b40d2c07f8..64275d009d4 100644 --- a/mysql-test/suite/perfschema/t/no_threads-master.opt +++ b/mysql-test/suite/perfschema/t/no_threads-master.opt @@ -1 +1 @@ ---thread-handling=no-threads --loose-performance-schema-max-thread_instances=10 --default-storage-engine=MyISAM --skip-innodb --server-id=0 +--thread-handling=no-threads --loose-performance-schema-max-thread_instances=10 --default-storage-engine=MyISAM --skip-innodb diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_event.test b/mysql-test/suite/perfschema/t/pfs_upgrade_event.test index 56747cf11f2..db7613052d4 100644 --- a/mysql-test/suite/perfschema/t/pfs_upgrade_event.test +++ b/mysql-test/suite/perfschema/t/pfs_upgrade_event.test @@ -5,6 +5,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc +--source include/have_innodb.inc # Some initial settings + Preemptive cleanup let $MYSQLD_DATADIR= `SELECT @@datadir`; diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_func.test b/mysql-test/suite/perfschema/t/pfs_upgrade_func.test index 1cc13a01f37..4f53aa1bdd1 100644 --- a/mysql-test/suite/perfschema/t/pfs_upgrade_func.test +++ b/mysql-test/suite/perfschema/t/pfs_upgrade_func.test @@ -5,6 +5,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc +--source include/have_innodb.inc # Some initial settings + Preemptive cleanup let $MYSQLD_DATADIR= `SELECT @@datadir`; diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_proc.test b/mysql-test/suite/perfschema/t/pfs_upgrade_proc.test index b8a52be0555..432cee6fb1a 100644 --- a/mysql-test/suite/perfschema/t/pfs_upgrade_proc.test +++ b/mysql-test/suite/perfschema/t/pfs_upgrade_proc.test @@ -5,6 +5,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc +--source include/have_innodb.inc # Some initial settings + Preemptive cleanup let $MYSQLD_DATADIR= `SELECT @@datadir`; diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_table.test b/mysql-test/suite/perfschema/t/pfs_upgrade_table.test index e1bb77e2c23..c68e156a2db 100644 --- a/mysql-test/suite/perfschema/t/pfs_upgrade_table.test +++ b/mysql-test/suite/perfschema/t/pfs_upgrade_table.test @@ -5,6 +5,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc +--source include/have_innodb.inc # Some initial settings + Preemptive cleanup let $MYSQLD_DATADIR= `SELECT @@datadir`; diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_view.test b/mysql-test/suite/perfschema/t/pfs_upgrade_view.test index 579fc763a0f..38ce377f235 100644 --- a/mysql-test/suite/perfschema/t/pfs_upgrade_view.test +++ b/mysql-test/suite/perfschema/t/pfs_upgrade_view.test @@ -5,6 +5,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc +--source include/have_innodb.inc # Some initial settings + Preemptive cleanup let $MYSQLD_DATADIR= `SELECT @@datadir`; diff --git a/mysql-test/suite/perfschema/t/privilege_table_io.test b/mysql-test/suite/perfschema/t/privilege_table_io.test index 8b4cc1a3d62..dc17fbcf67e 100644 --- a/mysql-test/suite/perfschema/t/privilege_table_io.test +++ b/mysql-test/suite/perfschema/t/privilege_table_io.test @@ -4,7 +4,7 @@ --source include/have_perfschema.inc --source ../include/table_io_setup_helper.inc -# Remove "deleted" records from mysql.* that may come from previous tests, +# Remove "deleted" records from mysql.db that may come from previous tests, # to avoid displaying spurious fetch. # There are two possible server reactions which are both ok. # Table Op Msg_type Msg_text diff --git a/mysql-test/suite/perfschema/t/relaylog-slave.opt b/mysql-test/suite/perfschema/t/relaylog-slave.opt deleted file mode 100644 index cef79bc8585..00000000000 --- a/mysql-test/suite/perfschema/t/relaylog-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---force-restart diff --git a/mysql-test/suite/perfschema/t/relaylog.test b/mysql-test/suite/perfschema/t/relaylog.test index d4989c64016..1455d1297e2 100644 --- a/mysql-test/suite/perfschema/t/relaylog.test +++ b/mysql-test/suite/perfschema/t/relaylog.test @@ -28,6 +28,9 @@ drop table test.t1; # - statistics are normalized to "NONE" or "MANY" # - statistics on ::update_cond conditions are not collected, # since this is too much dependent on execution. +# - statistics on COND_binlog_background_thread and COND_xid_list are not +# collected, as they depend on exact timing for background binlog +# checkpointing operations. # connection master; @@ -73,6 +76,8 @@ select from performance_schema.events_waits_summary_global_by_event_name where event_name like "%MYSQL_BIN_LOG%" and event_name not like "%MYSQL_BIN_LOG::update_cond" + and event_name not like "%MYSQL_BIN_LOG::COND_binlog_background_thread%" + and event_name not like "%MYSQL_BIN_LOG::COND_xid_list" order by event_name; -- echo "Expect no slave relay log" @@ -135,6 +140,8 @@ select from performance_schema.events_waits_summary_global_by_event_name where event_name like "%MYSQL_BIN_LOG%" and event_name not like "%MYSQL_BIN_LOG::update_cond" + and event_name not like "%MYSQL_BIN_LOG::COND_binlog_background_thread%" + and event_name not like "%MYSQL_BIN_LOG::COND_xid_list" order by event_name; -- echo "Expect a slave relay log" @@ -170,5 +177,5 @@ select and event_name not like "%MYSQL_RELAY_LOG::update_cond" order by event_name; ---source include/rpl_end.inc +--source include/stop_slave.inc diff --git a/mysql-test/suite/perfschema/t/rollback_table_io.test b/mysql-test/suite/perfschema/t/rollback_table_io.test index 8976a2f1b77..67d7e4ca160 100644 --- a/mysql-test/suite/perfschema/t/rollback_table_io.test +++ b/mysql-test/suite/perfschema/t/rollback_table_io.test @@ -15,6 +15,7 @@ let $engine_type= InnoDB; eval create table test.t1 (col1 bigint, col2 varchar(30)) engine = $engine_type; show create table test.t1; insert into test.t1 values(1,'One'); +eval set default_storage_engine=$engine_type; --source ../include/table_io_setup_helper.inc let $schema_to_dump= 'test'; diff --git a/mysql-test/suite/perfschema/t/rpl_gtid_func.test b/mysql-test/suite/perfschema/t/rpl_gtid_func.test index cdee1be6475..27837572bff 100644 --- a/mysql-test/suite/perfschema/t/rpl_gtid_func.test +++ b/mysql-test/suite/perfschema/t/rpl_gtid_func.test @@ -1,4 +1,5 @@ --source include/not_embedded.inc +--source include/have_innodb.inc --source include/have_perfschema.inc --source ../include/no_protocol.inc diff --git a/mysql-test/suite/perfschema/t/rpl_statements-master.opt b/mysql-test/suite/perfschema/t/rpl_statements-master.opt deleted file mode 100644 index 01cf3e0520f..00000000000 --- a/mysql-test/suite/perfschema/t/rpl_statements-master.opt +++ /dev/null @@ -1 +0,0 @@ ---binlog-format=mixed diff --git a/mysql-test/suite/perfschema/t/rpl_statements-slave.opt b/mysql-test/suite/perfschema/t/rpl_statements-slave.opt deleted file mode 100644 index 01cf3e0520f..00000000000 --- a/mysql-test/suite/perfschema/t/rpl_statements-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---binlog-format=mixed diff --git a/mysql-test/suite/perfschema/t/rpl_statements.test b/mysql-test/suite/perfschema/t/rpl_statements.test index 8e719610ba9..fa429cd2aa3 100644 --- a/mysql-test/suite/perfschema/t/rpl_statements.test +++ b/mysql-test/suite/perfschema/t/rpl_statements.test @@ -2,6 +2,7 @@ # Check statement instrumentation of replicated statements # --source include/not_embedded.inc +--source include/have_innodb.inc --source include/have_perfschema.inc --source ../include/no_protocol.inc --source include/have_binlog_format_mixed.inc diff --git a/mysql-test/suite/perfschema/t/server_init.test b/mysql-test/suite/perfschema/t/server_init.test index 8f5e18623f0..d5a7e18827d 100644 --- a/mysql-test/suite/perfschema/t/server_init.test +++ b/mysql-test/suite/perfschema/t/server_init.test @@ -44,9 +44,6 @@ select count(name) from cond_instances # Verify that these global mutexes have been properly initilized in sql select count(name) from mutex_instances - where name like "wait/synch/mutex/sql/LOCK_open"; - -select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_thread_count"; select count(name) from mutex_instances diff --git a/mysql-test/suite/perfschema/t/setup_instruments_defaults-master.opt b/mysql-test/suite/perfschema/t/setup_instruments_defaults-master.opt index eec7d4af545..408eb5c79d2 100644 --- a/mysql-test/suite/perfschema/t/setup_instruments_defaults-master.opt +++ b/mysql-test/suite/perfschema/t/setup_instruments_defaults-master.opt @@ -1,4 +1,3 @@ ---no-console --log-error=0 --loose-performance-schema-instrument='%=ON' --loose-performance-schema-instrument='' diff --git a/mysql-test/suite/perfschema/t/setup_instruments_defaults.test b/mysql-test/suite/perfschema/t/setup_instruments_defaults.test index cfddfd9f1e6..5fd5acceb34 100644 --- a/mysql-test/suite/perfschema/t/setup_instruments_defaults.test +++ b/mysql-test/suite/perfschema/t/setup_instruments_defaults.test @@ -62,7 +62,7 @@ WHERE name like "%wait/io/table/sql/handler%"; --send_shutdown --echo # Restart server with wait/io/table/sql/handler disabled ---exec echo "restart:--loose-performance-schema-instrument='%wait/io/table/sql/%=off'" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +--exec echo "restart:--loose-performance-schema-instrument=%wait/io/table/sql/%=off" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect # Turn on reconnect --echo # Enable reconnect diff --git a/mysql-test/suite/perfschema/t/short_option_1-master.opt b/mysql-test/suite/perfschema/t/short_option_1-master.opt index 6ef223bf49b..03c480fe90d 100644 --- a/mysql-test/suite/perfschema/t/short_option_1-master.opt +++ b/mysql-test/suite/perfschema/t/short_option_1-master.opt @@ -1 +1 @@ --a -n -Cutf8 --collation=utf8_bin -T12 -W3 +-a -Cutf8 --collation=utf8_bin -T12 -W3 diff --git a/mysql-test/suite/perfschema/t/short_option_1.test b/mysql-test/suite/perfschema/t/short_option_1.test index 2b616844e58..ff62a392cfa 100644 --- a/mysql-test/suite/perfschema/t/short_option_1.test +++ b/mysql-test/suite/perfschema/t/short_option_1.test @@ -11,10 +11,8 @@ show variables like 'sql_mode'; select @@character_set_server; show variables like 'character_set_system'; -show variables like 'log'; show variables like 'general_log'; show variables like 'new'; show variables like 'log_warnings'; - diff --git a/mysql-test/suite/perfschema/t/socket_connect.test b/mysql-test/suite/perfschema/t/socket_connect.test index 94625d2ed06..909840144ef 100644 --- a/mysql-test/suite/perfschema/t/socket_connect.test +++ b/mysql-test/suite/perfschema/t/socket_connect.test @@ -9,7 +9,7 @@ --source ../include/wait_for_pfs_thread_count.inc # Set this to enable debugging output -let $my_socket_debug=0; +let $my_socket_debug_dbug=0; --echo #============================================================================== --echo # Establish the level of IPV6 support diff --git a/mysql-test/suite/perfschema/t/socket_instances_func.test b/mysql-test/suite/perfschema/t/socket_instances_func.test index 8955d978ca8..12411103579 100644 --- a/mysql-test/suite/perfschema/t/socket_instances_func.test +++ b/mysql-test/suite/perfschema/t/socket_instances_func.test @@ -7,7 +7,7 @@ --source include/have_perfschema.inc # Set this to enable debugging output -let $my_socket_debug= 0; +let $my_socket_debug_dbug= 0; # # Set IP address defaults with respect to IPV6 support @@ -19,7 +19,7 @@ let $check_ipv6_just_check= 1; # Determine if IPV4 mapped to IPV6 supported let $check_ipv4_mapped_just_check= 1; ---source include/check_ipv4_mapped.inc +--source include/have_ipv4_mapped.inc let $my_localhost= 127.0.0.1; diff --git a/mysql-test/suite/perfschema/t/socket_instances_func_win.test b/mysql-test/suite/perfschema/t/socket_instances_func_win.test index d2b7a9f371c..5faf0d24ec4 100644 --- a/mysql-test/suite/perfschema/t/socket_instances_func_win.test +++ b/mysql-test/suite/perfschema/t/socket_instances_func_win.test @@ -7,7 +7,7 @@ --source include/have_perfschema.inc # Set this to enable debugging output -let $my_socket_debug= 0; +let $my_socket_debug_dbug= 0; # # Set IP address defaults with respect to IPV6 support @@ -19,7 +19,7 @@ let $check_ipv6_just_check= 1; # Determine if IPV4 mapped to IPV6 supported let $check_ipv4_mapped_just_check= 1; ---source include/check_ipv4_mapped.inc +--source include/have_ipv4_mapped.inc let $my_localhost= 127.0.0.1; diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test b/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test index 1c317cedcf5..5ba3af1e408 100644 --- a/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test +++ b/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test @@ -29,7 +29,7 @@ --source ../include/no_protocol.inc # Set this to enable debugging output -let $my_socket_debug= 0; +let $my_socket_debug_dbug= 0; --echo #============================================================================== --echo # Establish the level of IPV6 support diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test index cad6d5cf998..ef5096d85ff 100644 --- a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test +++ b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test @@ -43,17 +43,17 @@ # Set IP address defaults with respect to IPV6 support # # Set this to enable debugging output -let $my_socket_debug= 0; +let $my_socket_debug_dbug= 0; # # Determine if IPV6 supported # let $check_ipv6_just_check= 1; ---source include/check_ipv6.inc +--source include/have_ipv4_mapped.inc # # Determine if IPV4 mapped to IPV6 supported # let $check_ipv4_mapped_just_check= 1; ---source include/check_ipv4_mapped.inc +--source include/have_ipv4_mapped.inc # # Set the localhost IP default to use when establishing connections let $my_localhost=127.0.0.1; @@ -66,7 +66,7 @@ if($check_ipv4_mapped_supported) let $my_localhost=::ffff:127.0.0.1; } # -let $my_socket_debug= 0; +let $my_socket_debug_dbug= 0; if($my_socket_debug) { --echo IPV6=$check_ipv6_supported, IPV4_MAPPED = $check_ipv4_mapped_supported, LOCALHOST = $my_localhost diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test index c7ca254d5bb..5d4b4209b6e 100644 --- a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test +++ b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test @@ -45,7 +45,7 @@ # Set IP address defaults with respect to IPV6 support # # Set this to enable debugging output -let $my_socket_debug= 0; +let $my_socket_debug_dbug= 0; # # Determine if IPV6 supported # @@ -55,7 +55,7 @@ let $check_ipv6_just_check= 1; # Determine if IPV4 mapped to IPV6 supported # let $check_ipv4_mapped_just_check= 1; ---source include/check_ipv4_mapped.inc +--source include/have_ipv4_mapped.inc # # Set the localhost IP default to use when establishing connections let $my_localhost=127.0.0.1; @@ -68,7 +68,7 @@ if($check_ipv4_mapped_supported) let $my_localhost=::ffff:127.0.0.1; } # -let $my_socket_debug= 0; +let $my_socket_debug_dbug= 0; if($my_socket_debug) { --echo IPV6=$check_ipv6_supported, IPV4_MAPPED = $check_ipv4_mapped_supported, LOCALHOST = $my_localhost diff --git a/mysql-test/suite/perfschema/t/threads_mysql-master.opt b/mysql-test/suite/perfschema/t/threads_mysql-master.opt index 5eb588aa942..f93413a61e5 100644 --- a/mysql-test/suite/perfschema/t/threads_mysql-master.opt +++ b/mysql-test/suite/perfschema/t/threads_mysql-master.opt @@ -1,2 +1 @@ --event-scheduler ---thread_cache_size=0 diff --git a/mysql-test/suite/perfschema/t/update_order-3837.test b/mysql-test/suite/perfschema/t/update_order-3837.test new file mode 100644 index 00000000000..72e3941fcde --- /dev/null +++ b/mysql-test/suite/perfschema/t/update_order-3837.test @@ -0,0 +1,8 @@ +--source include/not_embedded.inc +--source include/have_perfschema.inc + +# +# MDEV-3837 Assertion `table->read_set == &table->def_read_set' failed on updating a performance_schema table +# +UPDATE performance_schema.setup_instruments SET timed = 'YES' ORDER BY name; + diff --git a/mysql-test/suite/perfschema/t/view_table_io.test b/mysql-test/suite/perfschema/t/view_table_io.test index f8e545e094e..703f5414ba4 100644 --- a/mysql-test/suite/perfschema/t/view_table_io.test +++ b/mysql-test/suite/perfschema/t/view_table_io.test @@ -6,7 +6,6 @@ --source include/not_embedded.inc --source include/have_perfschema.inc --source ../include/table_io_setup_helper.inc ---source include/have_QC_Disabled.inc let $engine_type= MyISAM; let $table_item= test.v1; |