diff options
| author | unknown <timour@askmonty.org> | 2013-07-08 15:19:50 +0300 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2013-07-08 15:19:50 +0300 |
| commit | 54999b2863ed7f6b1fc64f8347ae24a7a325b427 (patch) | |
| tree | d16f41be280d192ae960904ed146b84540ad11a4 | |
| parent | 30e34252f48599d605466c718ceb81a1a0e23b70 (diff) | |
| download | mariadb-git-54999b2863ed7f6b1fc64f8347ae24a7a325b427.tar.gz | |
Merge performance schema test cases from MySQL 5.6.10
Merged the majority of the PFS test cases.
There are still 19 failing test cases that need more attention.
196 files changed, 2423 insertions, 829 deletions
diff --git a/mysql-test/suite/perfschema/include/digest_cleanup.inc b/mysql-test/suite/perfschema/include/digest_cleanup.inc index 99dc41e660f..47dd7618b43 100644 --- a/mysql-test/suite/perfschema/include/digest_cleanup.inc +++ b/mysql-test/suite/perfschema/include/digest_cleanup.inc @@ -7,5 +7,8 @@ DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t3; DROP TABLE IF EXISTS t4; DROP TABLE IF EXISTS t5; +DROP TABLE IF EXISTS t6; +DROP TABLE IF EXISTS t11; +DROP TABLE IF EXISTS t12; DROP DATABASE IF EXISTS statements_digest; --enable_warnings diff --git a/mysql-test/suite/perfschema/include/digest_execution.inc b/mysql-test/suite/perfschema/include/digest_execution.inc index 34c49590217..5483cca61d7 100644 --- a/mysql-test/suite/perfschema/include/digest_execution.inc +++ b/mysql-test/suite/perfschema/include/digest_execution.inc @@ -34,6 +34,19 @@ INSERT INTO t3 VALUES (1, 2), (3, 4), (5, 6); INSERT INTO t5 VALUES (1, 2, 3), (4, 5, 6), (7, 8, 9); # ----------------------------------------------------------------------- +# Test case to handle NULL. If alone, not normalized otherwise normalized. +# ----------------------------------------------------------------------- +INSERT INTO t1 VALUES (NULL); +INSERT INTO t3 VALUES (NULL,NULL); +INSERT INTO t3 VALUES (1,NULL); +INSERT INTO t3 VALUES (NULL,1); +INSERT INTO t6 VALUES (NULL, NULL, NULL, NULL); +INSERT INTO t6 VALUES (1, NULL, NULL, NULL); +INSERT INTO t6 VALUES (NULL, 2, NULL, NULL); +INSERT INTO t6 VALUES (1, 2, 3, NULL); +INSERT INTO t6 VALUES (1, 2, NULL, 4); + +# ----------------------------------------------------------------------- # Test case for handling spaces in statement. # ----------------------------------------------------------------------- @@ -59,7 +72,6 @@ SELECT 1 /* This is an inline comment */ + 1; */ 1; - # ----------------------------------------------------------------------- # Tests to show how the digest behaves with tokens that can have multiple # names (such as DATABASE = "DATABASE" or "SCHEMA", SUBSTRING, STD_SYM, @@ -79,8 +91,40 @@ DROP DATABASE statements_digest_temp; # captured. # ----------------------------------------------------------------------- --ERROR ER_NO_SUCH_TABLE -SELECT 1 from t11; -create table t11 (c char(4)); +SELECT 1 FROM no_such_table; +CREATE TABLE dup_table (c char(4)); --ERROR ER_TABLE_EXISTS_ERROR -create table t11 (c char(4)); -insert into t11 values("MySQL"); +CREATE TABLE dup_table (c char(4)); +DROP TABLE dup_table; +INSERT INTO t11 VALUES("MySQL"); + +# ----------------------------------------------------------------------- +# Tests to show sub-statements for following statements are not +# instrumented. +# - Prepared Statements +# - Stored Procedures/Functions. +# - Table Triggers +# ----------------------------------------------------------------------- +PREPARE stmt FROM "SELECT * FROM t12"; +EXECUTE stmt; +EXECUTE stmt; +DEALLOCATE PREPARE stmt; + +DELIMITER //; +CREATE PROCEDURE p1() BEGIN SELECT * FROM t12; END// +DELIMITER ;// +CALL p1(); +CALL p1(); +DROP PROCEDURE p1; + +DELIMITER //; +CREATE FUNCTION `func`(a INT, b INT) RETURNS int(11) RETURN a+b // +DELIMITER ;// +select func(3,4); +select func(13,42); +DROP FUNCTION func; + +CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @a:=1; +INSERT INTO t12 VALUES ("abc"); +INSERT INTO t12 VALUES ("def"); +DROP TRIGGER trg; diff --git a/mysql-test/suite/perfschema/include/digest_setup.inc b/mysql-test/suite/perfschema/include/digest_setup.inc index 7145bcfa870..ed463f58d04 100644 --- a/mysql-test/suite/perfschema/include/digest_setup.inc +++ b/mysql-test/suite/perfschema/include/digest_setup.inc @@ -17,5 +17,8 @@ CREATE TABLE t2(a int); CREATE TABLE t3(a int, b int); CREATE TABLE t4(a int, b int); CREATE TABLE t5(a int, b int, c int); +CREATE TABLE t6(a int, b int, c int, d int); +CREATE TABLE t11 (c CHAR(4)); +CREATE TABLE t12 (c CHAR(4)); --enable_warnings diff --git a/mysql-test/suite/perfschema/include/hostcache_set_state.inc b/mysql-test/suite/perfschema/include/hostcache_set_state.inc new file mode 100644 index 00000000000..25dd56a4e0d --- /dev/null +++ b/mysql-test/suite/perfschema/include/hostcache_set_state.inc @@ -0,0 +1,23 @@ +# Helper for hostcache_*.test + +# Set a known initial state for the test + +flush status; +flush hosts; +flush user_resources; +flush privileges; + +# Print critical setup + +select @@global.debug; +select @@global.max_connect_errors; +select @@global.max_user_connections; +select @@global.max_connections; + +# Make sure there are no remaining records that can change the test outcome + +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; + diff --git a/mysql-test/suite/perfschema/include/schema.inc b/mysql-test/suite/perfschema/include/schema.inc index 6c3c391c171..f5f23893d37 100644 --- a/mysql-test/suite/perfschema/include/schema.inc +++ b/mysql-test/suite/perfschema/include/schema.inc @@ -21,6 +21,7 @@ show create table events_stages_summary_global_by_event_name; show create table events_statements_current; show create table events_statements_history; show create table events_statements_history_long; +show create table events_statements_summary_by_digest; show create table events_statements_summary_by_host_by_event_name; show create table events_statements_summary_by_thread_by_event_name; show create table events_statements_summary_by_user_by_event_name; @@ -38,7 +39,6 @@ show create table events_waits_summary_global_by_event_name; show create table file_instances; show create table file_summary_by_event_name; show create table file_summary_by_instance; ---error 1146 show create table host_cache; show create table hosts; show create table mutex_instances; diff --git a/mysql-test/suite/perfschema/include/start_server_common.inc b/mysql-test/suite/perfschema/include/start_server_common.inc index 6a7c7698999..d15c3d48ded 100644 --- a/mysql-test/suite/perfschema/include/start_server_common.inc +++ b/mysql-test/suite/perfschema/include/start_server_common.inc @@ -27,6 +27,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -43,21 +44,22 @@ select * from performance_schema.events_waits_summary_global_by_event_name; select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; ---error 1146 select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; diff --git a/mysql-test/suite/perfschema/r/csv_table_io.result b/mysql-test/suite/perfschema/r/csv_table_io.result index d5b39a2d90c..f0b5a6bb935 100644 --- a/mysql-test/suite/perfschema/r/csv_table_io.result +++ b/mysql-test/suite/perfschema/r/csv_table_io.result @@ -126,6 +126,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/digest_table_full.result b/mysql-test/suite/perfschema/r/digest_table_full.result index a1e2ec0bd6a..da06b34da2e 100644 --- a/mysql-test/suite/perfschema/r/digest_table_full.result +++ b/mysql-test/suite/perfschema/r/digest_table_full.result @@ -8,6 +8,9 @@ CREATE TABLE t2(a int); CREATE TABLE t3(a int, b int); CREATE TABLE t4(a int, b int); CREATE TABLE t5(a int, b int, c int); +CREATE TABLE t6(a int, b int, c int, d int); +CREATE TABLE t11 (c CHAR(4)); +CREATE TABLE t12 (c CHAR(4)); TRUNCATE TABLE performance_schema.events_statements_summary_by_digest; #################################### # EXECUTION @@ -35,6 +38,15 @@ INSERT INTO t1 VALUES (1), (2), (3); INSERT INTO t1 VALUES (1), (2), (3), (4); INSERT INTO t3 VALUES (1, 2), (3, 4), (5, 6); INSERT INTO t5 VALUES (1, 2, 3), (4, 5, 6), (7, 8, 9); +INSERT INTO t1 VALUES (NULL); +INSERT INTO t3 VALUES (NULL,NULL); +INSERT INTO t3 VALUES (1,NULL); +INSERT INTO t3 VALUES (NULL,1); +INSERT INTO t6 VALUES (NULL, NULL, NULL, NULL); +INSERT INTO t6 VALUES (1, NULL, NULL, NULL); +INSERT INTO t6 VALUES (NULL, 2, NULL, NULL); +INSERT INTO t6 VALUES (1, 2, 3, NULL); +INSERT INTO t6 VALUES (1, 2, NULL, 4); SELECT 1 + 1; 1 + 1 2 @@ -61,22 +73,47 @@ CREATE SCHEMA statements_digest_temp; DROP SCHEMA statements_digest_temp; CREATE DATABASE statements_digest_temp; DROP DATABASE statements_digest_temp; -SELECT 1 from t11; -ERROR 42S02: Table 'statements_digest.t11' doesn't exist -create table t11 (c char(4)); -create table t11 (c char(4)); -ERROR 42S01: Table 't11' already exists -insert into t11 values("MySQL"); +SELECT 1 FROM no_such_table; +ERROR 42S02: Table 'statements_digest.no_such_table' doesn't exist +CREATE TABLE dup_table (c char(4)); +CREATE TABLE dup_table (c char(4)); +ERROR 42S01: Table 'dup_table' already exists +DROP TABLE dup_table; +INSERT INTO t11 VALUES("MySQL"); Warnings: Warning 1265 Data truncated for column 'c' at row 1 +PREPARE stmt FROM "SELECT * FROM t12"; +EXECUTE stmt; +c +EXECUTE stmt; +c +DEALLOCATE PREPARE stmt; +CREATE PROCEDURE p1() BEGIN SELECT * FROM t12; END// +CALL p1(); +c +CALL p1(); +c +DROP PROCEDURE p1; +CREATE FUNCTION `func`(a INT, b INT) RETURNS int(11) RETURN a+b // +select func(3,4); +func(3,4) +7 +select func(13,42); +func(13,42) +55 +DROP FUNCTION func; +CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @a:=1; +INSERT INTO t12 VALUES ("abc"); +INSERT INTO t12 VALUES ("def"); +DROP TRIGGER trg; #################################### # QUERYING PS STATEMENT DIGEST #################################### -SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, +SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; -DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS -NULL NULL 29 21 1 2 -169378b8f621f69e494b409cac921a8a TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 +SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS +NULL NULL NULL 55 32 1 2 +statements_digest 35a1dd67493f13a363597c041f170f3a 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 @@ -91,4 +128,7 @@ DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t3; DROP TABLE IF EXISTS t4; DROP TABLE IF EXISTS t5; +DROP TABLE IF EXISTS t6; +DROP TABLE IF EXISTS t11; +DROP TABLE IF EXISTS t12; DROP DATABASE IF EXISTS statements_digest; diff --git a/mysql-test/suite/perfschema/r/dml_esms_by_digest.result b/mysql-test/suite/perfschema/r/dml_esms_by_digest.result index 032c19112e1..f831b4c2e86 100644 --- a/mysql-test/suite/perfschema/r/dml_esms_by_digest.result +++ b/mysql-test/suite/perfschema/r/dml_esms_by_digest.result @@ -1,9 +1,9 @@ select * from performance_schema.events_statements_summary_by_digest where digest like 'XXYYZZ%' limit 1; -DIGEST DIGEST_TEXT COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT SUM_LOCK_TIME SUM_ERRORS SUM_WARNINGS SUM_ROWS_AFFECTED SUM_ROWS_SENT SUM_ROWS_EXAMINED SUM_CREATED_TMP_DISK_TABLES SUM_CREATED_TMP_TABLES SUM_SELECT_FULL_JOIN SUM_SELECT_FULL_RANGE_JOIN SUM_SELECT_RANGE SUM_SELECT_RANGE_CHECK SUM_SELECT_SCAN SUM_SORT_MERGE_PASSES SUM_SORT_RANGE SUM_SORT_ROWS SUM_SORT_SCAN SUM_NO_INDEX_USED SUM_NO_GOOD_INDEX_USED FIRST_SEEN LAST_SEEN +SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT SUM_LOCK_TIME SUM_ERRORS SUM_WARNINGS SUM_ROWS_AFFECTED SUM_ROWS_SENT SUM_ROWS_EXAMINED SUM_CREATED_TMP_DISK_TABLES SUM_CREATED_TMP_TABLES SUM_SELECT_FULL_JOIN SUM_SELECT_FULL_RANGE_JOIN SUM_SELECT_RANGE SUM_SELECT_RANGE_CHECK SUM_SELECT_SCAN SUM_SORT_MERGE_PASSES SUM_SORT_RANGE SUM_SORT_ROWS SUM_SORT_SCAN SUM_NO_INDEX_USED SUM_NO_GOOD_INDEX_USED FIRST_SEEN LAST_SEEN select * from performance_schema.events_statements_summary_by_digest where digest='XXYYZZ'; -DIGEST DIGEST_TEXT COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT SUM_LOCK_TIME SUM_ERRORS SUM_WARNINGS SUM_ROWS_AFFECTED SUM_ROWS_SENT SUM_ROWS_EXAMINED SUM_CREATED_TMP_DISK_TABLES SUM_CREATED_TMP_TABLES SUM_SELECT_FULL_JOIN SUM_SELECT_FULL_RANGE_JOIN SUM_SELECT_RANGE SUM_SELECT_RANGE_CHECK SUM_SELECT_SCAN SUM_SORT_MERGE_PASSES SUM_SORT_RANGE SUM_SORT_ROWS SUM_SORT_SCAN SUM_NO_INDEX_USED SUM_NO_GOOD_INDEX_USED FIRST_SEEN LAST_SEEN +SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT SUM_LOCK_TIME SUM_ERRORS SUM_WARNINGS SUM_ROWS_AFFECTED SUM_ROWS_SENT SUM_ROWS_EXAMINED SUM_CREATED_TMP_DISK_TABLES SUM_CREATED_TMP_TABLES SUM_SELECT_FULL_JOIN SUM_SELECT_FULL_RANGE_JOIN SUM_SELECT_RANGE SUM_SELECT_RANGE_CHECK SUM_SELECT_SCAN SUM_SORT_MERGE_PASSES SUM_SORT_RANGE SUM_SORT_ROWS SUM_SORT_SCAN SUM_NO_INDEX_USED SUM_NO_GOOD_INDEX_USED FIRST_SEEN LAST_SEEN insert into performance_schema.events_statements_summary_by_digest set digest='XXYYZZ', count_star=1, sum_timer_wait=2, min_timer_wait=3, avg_timer_wait=4, max_timer_wait=5; diff --git a/mysql-test/suite/perfschema/r/dml_handler.result b/mysql-test/suite/perfschema/r/dml_handler.result index 707a1d7071a..ef1292a33cc 100644 --- a/mysql-test/suite/perfschema/r/dml_handler.result +++ b/mysql-test/suite/perfschema/r/dml_handler.result @@ -9,60 +9,69 @@ SELECT COUNT(*) FROM table_list INTO @table_count; # For each table in the performance schema, attempt HANDLER...OPEN, # which should fail with an error 1031, ER_ILLEGAL_HA. -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=49; +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=48; +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=47; +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=46; +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=45; +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=44; +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=43; +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=42; +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=41; +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=40; +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=39; +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=38; +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=37; +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=36; +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 +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 +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=35; +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=34; +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=33; +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 -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=32; +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 +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 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 diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result index 27e8a274638..f3728cbed1f 100644 --- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result +++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result @@ -72,3 +72,9 @@ LOCK TABLES performance_schema.setup_instruments READ; UNLOCK TABLES; LOCK TABLES performance_schema.setup_instruments WRITE; UNLOCK TABLES; + +# Bug#13813193 ASSERTION `TABLE->READ_SET == +# &TABLE->DEF_READ_SET' FAILED / MYSQL_UPDATE + +UPDATE performance_schema.setup_instruments SET timed='NO' +ORDER BY RAND(); diff --git a/mysql-test/suite/perfschema/r/func_file_io.result b/mysql-test/suite/perfschema/r/func_file_io.result index d925463a8c2..a71c8e601aa 100644 --- a/mysql-test/suite/perfschema/r/func_file_io.result +++ b/mysql-test/suite/perfschema/r/func_file_io.result @@ -144,6 +144,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/func_mutex.result b/mysql-test/suite/perfschema/r/func_mutex.result index 1c9d0b8a254..33da3429eeb 100644 --- a/mysql-test/suite/perfschema/r/func_mutex.result +++ b/mysql-test/suite/perfschema/r/func_mutex.result @@ -137,6 +137,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 736d42faaca..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("santa.claus.ipv4.example.com"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host grant select on test.* to 'root'@'192.0.2.4'; select "Con1 is alive"; Con1 is alive 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 44a57fce83c..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("santa.claus.ipv4.example.com"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host select "Con1 is alive"; Con1 is alive Con1 is alive 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 26edead868b..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("santa.claus.ipv4.example.com"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host grant select on test.* to 'root'@'192.0.2.4'; select "Con1 is alive"; Con1 is alive 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 f231dbfa488..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("santa.claus.ipv4.example.com"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host select "Con1 is alive"; Con1 is alive Con1 is alive 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 e3376e1f590..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("192.0.2.4"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host grant select on test.* to 'root'@'santa.claus.ipv4.example.com'; select "Con1 is alive"; Con1 is alive 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 9550a4e2e75..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("192.0.2.4"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host select "Con1 is alive"; Con1 is alive Con1 is alive 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 6f6bf6f6551..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("santa.claus.ipv4.example.com"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host grant select on test.* to 'root'@'santa.claus.ipv4.example.com'; grant select on test.* to 'root'@'192.0.2.4'; select "Con1 is alive"; 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 c84148506d6..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("santa.claus.ipv4.example.com"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host select "Con1 is alive"; Con1 is alive Con1 is alive 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 b8382581be5..553cd609b4d 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result @@ -1,8 +1,27 @@ flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host CREATE USER 'plug'@'santa.claus.ipv4.example.com' IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest'; CREATE USER 'plug_dest'@'santa.claus.ipv4.example.com' diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result index 1fa2f584fad..88c7c2fbd3d 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result @@ -1,12 +1,27 @@ flush status; flush hosts; flush user_resources; +flush privileges; select @@global.debug; @@global.debug select @@global.max_connect_errors; @@global.max_connect_errors 100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host select @@global.max_connect_errors into @saved_max_connect_errors; set global max_connect_errors = 2; grant select on test.* to 'root'@'santa.claus.ipv4.example.com'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result index 62e0bc35dd7..baf9eae9f5c 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result @@ -1,9 +1,28 @@ call mtr.add_suppression("192.0.2.4"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host select "Con1 is alive"; Con1 is alive Con1 is alive 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 94bc660727a..31e4bc9f843 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result @@ -1,17 +1,29 @@ flush status; flush hosts; flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 select @@global.max_user_connections; @@global.max_user_connections 1024 -select @@global.max_user_connections into @saved_max_user_connections; select @@global.max_connections; @@global.max_connections 151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +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' 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 a250fd62d9b..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("192.0.2.4"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host grant select on test.* to 'root'@'192.0.2.4'; grant select on test.* to 'root'@'santa.claus.ipv4.example.com'; select "Con1 is alive"; 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 0c6db1015b0..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("192.0.2.4"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host select "Con1 is alive"; Con1 is alive Con1 is alive 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 d35f471931f..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("192.0.2.4"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host grant select on test.* to 'root'@'192.0.2.4'; select "Con1 is alive"; Con1 is alive 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 3e7c25e77a0..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("192.0.2.4"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host select "Con1 is alive"; Con1 is alive Con1 is alive diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result index ced889c363b..69f68de8d90 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result @@ -1,9 +1,27 @@ flush status; flush hosts; flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host create user 'user_without'@'santa.claus.ipv4.example.com'; create user 'user_with'@'santa.claus.ipv4.example.com' identified by 'good_password'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result index 3ee017b1f31..a3d2b1d273f 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result @@ -1,9 +1,27 @@ flush status; flush hosts; flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host create user 'user_ssl'@'santa.claus.ipv4.example.com'; create user 'user_ssl_x509'@'santa.claus.ipv4.example.com' identified by 'good_password'; 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 6d16af7fa7d..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("santa.claus.ipv6.example.com"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host grant select on test.* to 'root'@'2001:db8::6:6'; select "Con1 is alive"; Con1 is alive 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 e0f421dacaa..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("santa.claus.ipv6.example.com"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host select "Con1 is alive"; Con1 is alive Con1 is alive 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 b464442848a..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("santa.claus.ipv6.example.com"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host grant select on test.* to 'root'@'2001:db8::6:6'; select "Con1 is alive"; Con1 is alive 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 1f8c5949342..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("santa.claus.ipv6.example.com"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host select "Con1 is alive"; Con1 is alive Con1 is alive 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 f29227577a0..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("192.0.2.4"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host grant select on test.* to 'root'@'santa.claus.ipv6.example.com'; select "Con1 is alive"; Con1 is alive 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 3932aa6d47d..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 @@ -1,8 +1,27 @@ flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host select "Con1 is alive"; Con1 is alive Con1 is alive 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 fcba40f431e..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("santa.claus.ipv6.example.com"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host grant select on test.* to 'root'@'santa.claus.ipv6.example.com'; grant select on test.* to 'root'@'2001:db8::6:6'; select "Con1 is alive"; 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 225b22e58d3..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("santa.claus.ipv6.example.com"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host select "Con1 is alive"; Con1 is alive Con1 is alive 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 b51d3e236bf..b0764faf525 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result @@ -1,8 +1,27 @@ flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host CREATE USER 'plug'@'santa.claus.ipv6.example.com' IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest'; CREATE USER 'plug_dest'@'santa.claus.ipv6.example.com' diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result index 973297578bc..0097c680c70 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result @@ -1,12 +1,27 @@ flush status; flush hosts; flush user_resources; +flush privileges; select @@global.debug; @@global.debug select @@global.max_connect_errors; @@global.max_connect_errors 100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host select @@global.max_connect_errors into @saved_max_connect_errors; set global max_connect_errors = 2; grant select on test.* to 'root'@'santa.claus.ipv6.example.com'; 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 c76c9cc2d05..4416b78d009 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result @@ -1,17 +1,29 @@ flush status; flush hosts; flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 select @@global.max_user_connections; @@global.max_user_connections 1024 -select @@global.max_user_connections into @saved_max_user_connections; select @@global.max_connections; @@global.max_connections 151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +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' 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 380b5110364..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("2001:db8::6:6"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host grant select on test.* to 'root'@'2001:db8::6:6'; grant select on test.* to 'root'@'santa.claus.ipv6.example.com'; select "Con1 is alive"; 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 95897a490aa..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("2001:db8::6:6"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host select "Con1 is alive"; Con1 is alive Con1 is alive 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 112073063f3..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("2001:db8::6:6"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host grant select on test.* to 'root'@'2001:db8::6:6'; select "Con1 is alive"; Con1 is alive 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 412e8c2dab2..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 @@ -1,9 +1,28 @@ call mtr.add_suppression("2001:db8::6:6"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host select "Con1 is alive"; Con1 is alive Con1 is alive diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result index d182d4eb5af..5c3b363c5cd 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result @@ -1,9 +1,27 @@ flush status; flush hosts; flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host create user 'user_without'@'santa.claus.ipv6.example.com'; create user 'user_with'@'santa.claus.ipv6.example.com' identified by 'good_password'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result index 9d7d60c0008..422db77b5ae 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result @@ -1,9 +1,27 @@ flush status; flush hosts; flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host create user 'user_ssl'@'santa.claus.ipv6.example.com'; create user 'user_ssl_x509'@'santa.claus.ipv6.example.com' identified by 'good_password'; diff --git a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result index 46c8489eea0..70618be6145 100644 --- a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result +++ b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result @@ -1,8 +1,27 @@ flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host show global status like "connection_errors_%"; Variable_name Value Connection_errors_accept 0 diff --git a/mysql-test/suite/perfschema/r/indexed_table_io.result b/mysql-test/suite/perfschema/r/indexed_table_io.result index 6b420323b74..57518673491 100644 --- a/mysql-test/suite/perfschema/r/indexed_table_io.result +++ b/mysql-test/suite/perfschema/r/indexed_table_io.result @@ -139,6 +139,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/information_schema.result b/mysql-test/suite/perfschema/r/information_schema.result index 8497f7ea40d..5e5ce57fb2e 100644 --- a/mysql-test/suite/perfschema/r/information_schema.result +++ b/mysql-test/suite/perfschema/r/information_schema.result @@ -33,11 +33,14 @@ performance_schema events_waits_summary_global_by_event_name def performance_schema file_instances def performance_schema file_summary_by_event_name def performance_schema file_summary_by_instance def +performance_schema host_cache def performance_schema hosts def performance_schema mutex_instances def performance_schema objects_summary_global_by_type def performance_schema performance_timers def performance_schema rwlock_instances def +performance_schema session_account_connect_attrs def +performance_schema session_connect_attrs def performance_schema setup_actors def performance_schema setup_consumers def performance_schema setup_instruments def @@ -86,11 +89,14 @@ events_waits_summary_global_by_event_name BASE TABLE PERFORMANCE_SCHEMA file_instances BASE TABLE PERFORMANCE_SCHEMA file_summary_by_event_name BASE TABLE PERFORMANCE_SCHEMA file_summary_by_instance BASE TABLE PERFORMANCE_SCHEMA +host_cache BASE TABLE PERFORMANCE_SCHEMA hosts BASE TABLE PERFORMANCE_SCHEMA mutex_instances BASE TABLE PERFORMANCE_SCHEMA objects_summary_global_by_type BASE TABLE PERFORMANCE_SCHEMA performance_timers BASE TABLE PERFORMANCE_SCHEMA rwlock_instances BASE TABLE PERFORMANCE_SCHEMA +session_account_connect_attrs BASE TABLE PERFORMANCE_SCHEMA +session_connect_attrs BASE TABLE PERFORMANCE_SCHEMA setup_actors BASE TABLE PERFORMANCE_SCHEMA setup_consumers BASE TABLE PERFORMANCE_SCHEMA setup_instruments BASE TABLE PERFORMANCE_SCHEMA @@ -139,11 +145,14 @@ events_waits_summary_global_by_event_name 10 Dynamic file_instances 10 Dynamic file_summary_by_event_name 10 Dynamic file_summary_by_instance 10 Dynamic +host_cache 10 Dynamic hosts 10 Fixed mutex_instances 10 Dynamic objects_summary_global_by_type 10 Dynamic performance_timers 10 Fixed rwlock_instances 10 Dynamic +session_account_connect_attrs 10 Dynamic +session_connect_attrs 10 Dynamic setup_actors 10 Fixed setup_consumers 10 Dynamic setup_instruments 10 Dynamic @@ -192,11 +201,14 @@ events_waits_summary_global_by_event_name 1000 0 file_instances 1000 0 file_summary_by_event_name 1000 0 file_summary_by_instance 1000 0 +host_cache 1000 0 hosts 1000 0 mutex_instances 1000 0 objects_summary_global_by_type 1000 0 performance_timers 5 0 rwlock_instances 1000 0 +session_account_connect_attrs 1000 0 +session_connect_attrs 1000 0 setup_actors 1 0 setup_consumers 12 0 setup_instruments 1000 0 @@ -245,11 +257,14 @@ events_waits_summary_global_by_event_name 0 0 file_instances 0 0 file_summary_by_event_name 0 0 file_summary_by_instance 0 0 +host_cache 0 0 hosts 0 0 mutex_instances 0 0 objects_summary_global_by_type 0 0 performance_timers 0 0 rwlock_instances 0 0 +session_account_connect_attrs 0 0 +session_connect_attrs 0 0 setup_actors 0 0 setup_consumers 0 0 setup_instruments 0 0 @@ -298,11 +313,14 @@ events_waits_summary_global_by_event_name 0 0 NULL file_instances 0 0 NULL file_summary_by_event_name 0 0 NULL file_summary_by_instance 0 0 NULL +host_cache 0 0 NULL hosts 0 0 NULL mutex_instances 0 0 NULL objects_summary_global_by_type 0 0 NULL performance_timers 0 0 NULL rwlock_instances 0 0 NULL +session_account_connect_attrs 0 0 NULL +session_connect_attrs 0 0 NULL setup_actors 0 0 NULL setup_consumers 0 0 NULL setup_instruments 0 0 NULL @@ -351,11 +369,14 @@ events_waits_summary_global_by_event_name NULL NULL NULL file_instances NULL NULL NULL file_summary_by_event_name NULL NULL NULL file_summary_by_instance NULL NULL NULL +host_cache NULL NULL NULL hosts NULL NULL NULL mutex_instances NULL NULL NULL objects_summary_global_by_type NULL NULL NULL performance_timers NULL NULL NULL rwlock_instances NULL NULL NULL +session_account_connect_attrs NULL NULL NULL +session_connect_attrs NULL NULL NULL setup_actors NULL NULL NULL setup_consumers NULL NULL NULL setup_instruments NULL NULL NULL @@ -404,11 +425,14 @@ events_waits_summary_global_by_event_name utf8_general_ci NULL file_instances utf8_general_ci NULL file_summary_by_event_name utf8_general_ci NULL file_summary_by_instance utf8_general_ci NULL +host_cache utf8_general_ci NULL hosts utf8_general_ci NULL mutex_instances utf8_general_ci NULL objects_summary_global_by_type utf8_general_ci NULL performance_timers utf8_general_ci NULL rwlock_instances utf8_general_ci NULL +session_account_connect_attrs utf8_bin NULL +session_connect_attrs utf8_bin NULL setup_actors utf8_general_ci NULL setup_consumers utf8_general_ci NULL setup_instruments utf8_general_ci NULL @@ -457,11 +481,14 @@ events_waits_summary_global_by_event_name file_instances file_summary_by_event_name file_summary_by_instance +host_cache hosts mutex_instances objects_summary_global_by_type performance_timers rwlock_instances +session_account_connect_attrs +session_connect_attrs setup_actors setup_consumers setup_instruments diff --git a/mysql-test/suite/perfschema/r/innodb_table_io.result b/mysql-test/suite/perfschema/r/innodb_table_io.result index d6dd7e3b122..9b5bd783f88 100644 --- a/mysql-test/suite/perfschema/r/innodb_table_io.result +++ b/mysql-test/suite/perfschema/r/innodb_table_io.result @@ -130,6 +130,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/memory_table_io.result b/mysql-test/suite/perfschema/r/memory_table_io.result index 8d314d52ec3..230de713846 100644 --- a/mysql-test/suite/perfschema/r/memory_table_io.result +++ b/mysql-test/suite/perfschema/r/memory_table_io.result @@ -128,6 +128,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/merge_table_io.result b/mysql-test/suite/perfschema/r/merge_table_io.result index 8d93d3798a4..7f0b602778c 100644 --- a/mysql-test/suite/perfschema/r/merge_table_io.result +++ b/mysql-test/suite/perfschema/r/merge_table_io.result @@ -158,6 +158,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/multi_table_io.result b/mysql-test/suite/perfschema/r/multi_table_io.result index b72cc6b164f..74c8b94c1d5 100644 --- a/mysql-test/suite/perfschema/r/multi_table_io.result +++ b/mysql-test/suite/perfschema/r/multi_table_io.result @@ -87,6 +87,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/myisam_file_io.result b/mysql-test/suite/perfschema/r/myisam_file_io.result index b433d1391b7..826c4563932 100644 --- a/mysql-test/suite/perfschema/r/myisam_file_io.result +++ b/mysql-test/suite/perfschema/r/myisam_file_io.result @@ -57,6 +57,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/myisam_table_io.result b/mysql-test/suite/perfschema/r/myisam_table_io.result index 517252a9dd6..432e5964802 100644 --- a/mysql-test/suite/perfschema/r/myisam_table_io.result +++ b/mysql-test/suite/perfschema/r/myisam_table_io.result @@ -126,6 +126,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/nesting.result b/mysql-test/suite/perfschema/r/nesting.result index a7b26b34776..fc1518ddd97 100644 --- a/mysql-test/suite/perfschema/r/nesting.result +++ b/mysql-test/suite/perfschema/r/nesting.result @@ -55,6 +55,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result index 6a4fde4287a..8c8cb918025 100644 --- a/mysql-test/suite/perfschema/r/ortho_iter.result +++ b/mysql-test/suite/perfschema/r/ortho_iter.result @@ -115,11 +115,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -138,6 +139,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade.result b/mysql-test/suite/perfschema/r/pfs_upgrade.result deleted file mode 100644 index 9a2b6524c83..00000000000 --- a/mysql-test/suite/perfschema/r/pfs_upgrade.result +++ /dev/null @@ -1,303 +0,0 @@ -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; -"Testing mysql_upgrade with TABLE performance_schema.user_table" -create table test.user_table(a int); -use performance_schema; -show tables like "user_table"; -Tables_in_performance_schema (user_table) -user_table -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 '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 -FATAL ERROR: Upgrade failed -show tables like "user_table"; -Tables_in_performance_schema (user_table) -user_table -use test; -drop table test.user_table; -"Testing mysql_upgrade with VIEW performance_schema.user_view" -create view test.user_view as select "Not supposed to be here"; -use performance_schema; -show tables like "user_view"; -Tables_in_performance_schema (user_view) -user_view -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 '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 -FATAL ERROR: Upgrade failed -show tables like "user_view"; -Tables_in_performance_schema (user_view) -user_view -use test; -drop view test.user_view; -"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'; -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 '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 -FATAL ERROR: Upgrade failed -select name from mysql.proc where db='performance_schema'; -name -user_proc -update mysql.proc set db='test' where name='user_proc'; -drop procedure test.user_proc; -"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'; -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 '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 -FATAL ERROR: Upgrade failed -select name from mysql.proc where db='performance_schema'; -name -user_func -update mysql.proc set db='test' where name='user_func'; -drop function test.user_func; -"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'; -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 '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 -FATAL ERROR: Upgrade failed -select name from mysql.event where db='performance_schema'; -name -user_event -update mysql.event set db='test' where name='user_event'; -drop event test.user_event; diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_event.result b/mysql-test/suite/perfschema/r/pfs_upgrade_event.result new file mode 100644 index 00000000000..cbd684a6232 --- /dev/null +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_event.result @@ -0,0 +1,63 @@ +drop event if exists test.user_event; +"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'; +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 +user_event +update mysql.event set db='test' where name='user_event'; +drop event test.user_event; diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_func.result b/mysql-test/suite/perfschema/r/pfs_upgrade_func.result new file mode 100644 index 00000000000..6978e1ed0a8 --- /dev/null +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_func.result @@ -0,0 +1,63 @@ +drop function if exists test.user_func; +"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'; +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 +user_func +update mysql.proc set db='test' where name='user_func'; +drop function test.user_func; diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result b/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result new file mode 100644 index 00000000000..f5a13fb445d --- /dev/null +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result @@ -0,0 +1,63 @@ +drop procedure if exists test.user_proc; +"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'; +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 +user_proc +update mysql.proc set db='test' where name='user_proc'; +drop procedure test.user_proc; diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_table.result b/mysql-test/suite/perfschema/r/pfs_upgrade_table.result new file mode 100644 index 00000000000..bb5ba7060ae --- /dev/null +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_table.result @@ -0,0 +1,65 @@ +drop table if exists test.user_table; +"Testing mysql_upgrade with TABLE performance_schema.user_table" +create table test.user_table(a int); +use performance_schema; +show tables like "user_table"; +Tables_in_performance_schema (user_table) +user_table +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) +user_table +use test; +drop table test.user_table; diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_view.result b/mysql-test/suite/perfschema/r/pfs_upgrade_view.result new file mode 100644 index 00000000000..f9541680b6d --- /dev/null +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_view.result @@ -0,0 +1,65 @@ +drop view if exists test.user_view; +"Testing mysql_upgrade with VIEW performance_schema.user_view" +create view test.user_view as select "Not supposed to be here"; +use performance_schema; +show tables like "user_view"; +Tables_in_performance_schema (user_view) +user_view +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) +user_view +use test; +drop view test.user_view; diff --git a/mysql-test/suite/perfschema/r/privilege_table_io.result b/mysql-test/suite/perfschema/r/privilege_table_io.result index 92c5d36ed9f..2bc96f21cfc 100644 --- a/mysql-test/suite/perfschema/r/privilege_table_io.result +++ b/mysql-test/suite/perfschema/r/privilege_table_io.result @@ -8,7 +8,13 @@ truncate table performance_schema.events_waits_history_long; flush status; flush tables; # We are forced to suppress here the server response. +optimize table mysql.host; +optimize table mysql.user; optimize table mysql.db; +optimize table mysql.proxies_priv; +optimize table mysql.tables_priv; +optimize table mysql.procs_priv; +optimize table mysql.servers; update performance_schema.setup_consumers set enabled='YES'; update performance_schema.setup_objects set enabled='YES' where object_type='TABLE' and object_schema= 'mysql'; @@ -40,11 +46,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -63,6 +70,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -117,6 +125,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/rollback_table_io.result b/mysql-test/suite/perfschema/r/rollback_table_io.result index ec1c1b86fb4..f08d11e21d8 100644 --- a/mysql-test/suite/perfschema/r/rollback_table_io.result +++ b/mysql-test/suite/perfschema/r/rollback_table_io.result @@ -69,6 +69,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/schema.result b/mysql-test/suite/perfschema/r/schema.result index d3b5572c383..050c4461105 100644 --- a/mysql-test/suite/perfschema/r/schema.result +++ b/mysql-test/suite/perfschema/r/schema.result @@ -38,11 +38,14 @@ events_waits_summary_global_by_event_name file_instances file_summary_by_event_name file_summary_by_instance +host_cache hosts mutex_instances objects_summary_global_by_type performance_timers rwlock_instances +session_account_connect_attrs +session_connect_attrs setup_actors setup_consumers setup_instruments @@ -73,7 +76,7 @@ cond_instances CREATE TABLE `cond_instances` ( show create table events_stages_current; Table Create Table events_stages_current CREATE TABLE `events_stages_current` ( - `THREAD_ID` int(11) NOT NULL, + `THREAD_ID` bigint(20) unsigned NOT NULL, `EVENT_ID` bigint(20) unsigned NOT NULL, `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, @@ -87,7 +90,7 @@ events_stages_current CREATE TABLE `events_stages_current` ( show create table events_stages_history; Table Create Table events_stages_history CREATE TABLE `events_stages_history` ( - `THREAD_ID` int(11) NOT NULL, + `THREAD_ID` bigint(20) unsigned NOT NULL, `EVENT_ID` bigint(20) unsigned NOT NULL, `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, @@ -101,7 +104,7 @@ events_stages_history CREATE TABLE `events_stages_history` ( show create table events_stages_history_long; Table Create Table events_stages_history_long CREATE TABLE `events_stages_history_long` ( - `THREAD_ID` int(11) NOT NULL, + `THREAD_ID` bigint(20) unsigned NOT NULL, `EVENT_ID` bigint(20) unsigned NOT NULL, `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, @@ -126,7 +129,7 @@ events_stages_summary_by_host_by_event_name CREATE TABLE `events_stages_summary_ show create table events_stages_summary_by_thread_by_event_name; Table Create Table events_stages_summary_by_thread_by_event_name CREATE TABLE `events_stages_summary_by_thread_by_event_name` ( - `THREAD_ID` int(11) NOT NULL, + `THREAD_ID` bigint(20) unsigned NOT NULL, `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, @@ -170,7 +173,7 @@ events_stages_summary_global_by_event_name CREATE TABLE `events_stages_summary_g show create table events_statements_current; Table Create Table events_statements_current CREATE TABLE `events_statements_current` ( - `THREAD_ID` int(11) NOT NULL, + `THREAD_ID` bigint(20) unsigned NOT NULL, `EVENT_ID` bigint(20) unsigned NOT NULL, `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, @@ -214,7 +217,7 @@ events_statements_current CREATE TABLE `events_statements_current` ( show create table events_statements_history; Table Create Table events_statements_history CREATE TABLE `events_statements_history` ( - `THREAD_ID` int(11) NOT NULL, + `THREAD_ID` bigint(20) unsigned NOT NULL, `EVENT_ID` bigint(20) unsigned NOT NULL, `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, @@ -258,7 +261,7 @@ events_statements_history CREATE TABLE `events_statements_history` ( show create table events_statements_history_long; Table Create Table events_statements_history_long CREATE TABLE `events_statements_history_long` ( - `THREAD_ID` int(11) NOT NULL, + `THREAD_ID` bigint(20) unsigned NOT NULL, `EVENT_ID` bigint(20) unsigned NOT NULL, `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, @@ -299,6 +302,39 @@ events_statements_history_long CREATE TABLE `events_statements_history_long` ( `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL, `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 +show create table events_statements_summary_by_digest; +Table Create Table +events_statements_summary_by_digest CREATE TABLE `events_statements_summary_by_digest` ( + `SCHEMA_NAME` varchar(64) DEFAULT NULL, + `DIGEST` varchar(32) DEFAULT NULL, + `DIGEST_TEXT` longtext, + `COUNT_STAR` bigint(20) unsigned NOT NULL, + `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, + `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL, + `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL, + `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL, + `SUM_LOCK_TIME` bigint(20) unsigned NOT NULL, + `SUM_ERRORS` bigint(20) unsigned NOT NULL, + `SUM_WARNINGS` bigint(20) unsigned NOT NULL, + `SUM_ROWS_AFFECTED` bigint(20) unsigned NOT NULL, + `SUM_ROWS_SENT` bigint(20) unsigned NOT NULL, + `SUM_ROWS_EXAMINED` bigint(20) unsigned NOT NULL, + `SUM_CREATED_TMP_DISK_TABLES` bigint(20) unsigned NOT NULL, + `SUM_CREATED_TMP_TABLES` bigint(20) unsigned NOT NULL, + `SUM_SELECT_FULL_JOIN` bigint(20) unsigned NOT NULL, + `SUM_SELECT_FULL_RANGE_JOIN` bigint(20) unsigned NOT NULL, + `SUM_SELECT_RANGE` bigint(20) unsigned NOT NULL, + `SUM_SELECT_RANGE_CHECK` bigint(20) unsigned NOT NULL, + `SUM_SELECT_SCAN` bigint(20) unsigned NOT NULL, + `SUM_SORT_MERGE_PASSES` bigint(20) unsigned NOT NULL, + `SUM_SORT_RANGE` bigint(20) unsigned NOT NULL, + `SUM_SORT_ROWS` bigint(20) unsigned NOT NULL, + `SUM_SORT_SCAN` bigint(20) unsigned NOT NULL, + `SUM_NO_INDEX_USED` bigint(20) unsigned NOT NULL, + `SUM_NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL, + `FIRST_SEEN` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `LAST_SEEN` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' +) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 show create table events_statements_summary_by_host_by_event_name; Table Create Table events_statements_summary_by_host_by_event_name CREATE TABLE `events_statements_summary_by_host_by_event_name` ( @@ -332,7 +368,7 @@ events_statements_summary_by_host_by_event_name CREATE TABLE `events_statements_ show create table events_statements_summary_by_thread_by_event_name; Table Create Table events_statements_summary_by_thread_by_event_name CREATE TABLE `events_statements_summary_by_thread_by_event_name` ( - `THREAD_ID` int(11) NOT NULL, + `THREAD_ID` bigint(20) unsigned NOT NULL, `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, @@ -452,7 +488,7 @@ events_statements_summary_global_by_event_name CREATE TABLE `events_statements_s show create table events_waits_current; Table Create Table events_waits_current CREATE TABLE `events_waits_current` ( - `THREAD_ID` int(11) NOT NULL, + `THREAD_ID` bigint(20) unsigned NOT NULL, `EVENT_ID` bigint(20) unsigned NOT NULL, `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, @@ -475,7 +511,7 @@ events_waits_current CREATE TABLE `events_waits_current` ( show create table events_waits_history; Table Create Table events_waits_history CREATE TABLE `events_waits_history` ( - `THREAD_ID` int(11) NOT NULL, + `THREAD_ID` bigint(20) unsigned NOT NULL, `EVENT_ID` bigint(20) unsigned NOT NULL, `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, @@ -498,7 +534,7 @@ events_waits_history CREATE TABLE `events_waits_history` ( show create table events_waits_history_long; Table Create Table events_waits_history_long CREATE TABLE `events_waits_history_long` ( - `THREAD_ID` int(11) NOT NULL, + `THREAD_ID` bigint(20) unsigned NOT NULL, `EVENT_ID` bigint(20) unsigned NOT NULL, `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, @@ -543,7 +579,7 @@ events_waits_summary_by_instance CREATE TABLE `events_waits_summary_by_instance` show create table events_waits_summary_by_thread_by_event_name; Table Create Table events_waits_summary_by_thread_by_event_name CREATE TABLE `events_waits_summary_by_thread_by_event_name` ( - `THREAD_ID` int(11) NOT NULL, + `THREAD_ID` bigint(20) unsigned NOT NULL, `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, @@ -648,7 +684,38 @@ file_summary_by_instance CREATE TABLE `file_summary_by_instance` ( `MAX_TIMER_MISC` bigint(20) unsigned NOT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 show create table host_cache; -ERROR 42S02: Table 'performance_schema.host_cache' doesn't exist +Table Create Table +host_cache CREATE TABLE `host_cache` ( + `IP` varchar(64) NOT NULL, + `HOST` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, + `HOST_VALIDATED` enum('YES','NO') NOT NULL, + `SUM_CONNECT_ERRORS` bigint(20) NOT NULL, + `COUNT_HOST_BLOCKED_ERRORS` bigint(20) NOT NULL, + `COUNT_NAMEINFO_TRANSIENT_ERRORS` bigint(20) NOT NULL, + `COUNT_NAMEINFO_PERMANENT_ERRORS` bigint(20) NOT NULL, + `COUNT_FORMAT_ERRORS` bigint(20) NOT NULL, + `COUNT_ADDRINFO_TRANSIENT_ERRORS` bigint(20) NOT NULL, + `COUNT_ADDRINFO_PERMANENT_ERRORS` bigint(20) NOT NULL, + `COUNT_FCRDNS_ERRORS` bigint(20) NOT NULL, + `COUNT_HOST_ACL_ERRORS` bigint(20) NOT NULL, + `COUNT_NO_AUTH_PLUGIN_ERRORS` bigint(20) NOT NULL, + `COUNT_AUTH_PLUGIN_ERRORS` bigint(20) NOT NULL, + `COUNT_HANDSHAKE_ERRORS` bigint(20) NOT NULL, + `COUNT_PROXY_USER_ERRORS` bigint(20) NOT NULL, + `COUNT_PROXY_USER_ACL_ERRORS` bigint(20) NOT NULL, + `COUNT_AUTHENTICATION_ERRORS` bigint(20) NOT NULL, + `COUNT_SSL_ERRORS` bigint(20) NOT NULL, + `COUNT_MAX_USER_CONNECTIONS_ERRORS` bigint(20) NOT NULL, + `COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS` bigint(20) NOT NULL, + `COUNT_DEFAULT_DATABASE_ERRORS` bigint(20) NOT NULL, + `COUNT_INIT_CONNECT_ERRORS` bigint(20) NOT NULL, + `COUNT_LOCAL_ERRORS` bigint(20) NOT NULL, + `COUNT_UNKNOWN_ERRORS` bigint(20) NOT NULL, + `FIRST_SEEN` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `LAST_SEEN` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `FIRST_ERROR_SEEN` timestamp NULL DEFAULT '0000-00-00 00:00:00', + `LAST_ERROR_SEEN` timestamp NULL DEFAULT '0000-00-00 00:00:00' +) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 show create table hosts; Table Create Table hosts CREATE TABLE `hosts` ( @@ -661,7 +728,7 @@ Table Create Table mutex_instances CREATE TABLE `mutex_instances` ( `NAME` varchar(128) NOT NULL, `OBJECT_INSTANCE_BEGIN` bigint(20) unsigned NOT NULL, - `LOCKED_BY_THREAD_ID` int(11) DEFAULT NULL + `LOCKED_BY_THREAD_ID` bigint(20) unsigned DEFAULT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 show create table objects_summary_global_by_type; Table Create Table @@ -688,7 +755,7 @@ Table Create Table rwlock_instances CREATE TABLE `rwlock_instances` ( `NAME` varchar(128) NOT NULL, `OBJECT_INSTANCE_BEGIN` bigint(20) unsigned NOT NULL, - `WRITE_LOCKED_BY_THREAD_ID` int(11) DEFAULT NULL, + `WRITE_LOCKED_BY_THREAD_ID` bigint(20) unsigned DEFAULT NULL, `READ_LOCKED_BY_COUNT` int(10) unsigned NOT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 show create table setup_actors; @@ -731,7 +798,7 @@ Table Create Table socket_instances CREATE TABLE `socket_instances` ( `EVENT_NAME` varchar(128) NOT NULL, `OBJECT_INSTANCE_BEGIN` bigint(20) unsigned NOT NULL, - `THREAD_ID` int(11) DEFAULT NULL, + `THREAD_ID` bigint(20) unsigned DEFAULT NULL, `SOCKET_ID` int(11) NOT NULL, `IP` varchar(64) NOT NULL, `PORT` int(11) NOT NULL, @@ -957,10 +1024,10 @@ table_lock_waits_summary_by_table CREATE TABLE `table_lock_waits_summary_by_tabl show create table threads; Table Create Table threads CREATE TABLE `threads` ( - `THREAD_ID` int(11) NOT NULL, + `THREAD_ID` bigint(20) unsigned NOT NULL, `NAME` varchar(128) NOT NULL, `TYPE` varchar(10) NOT NULL, - `PROCESSLIST_ID` int(11) DEFAULT NULL, + `PROCESSLIST_ID` bigint(20) unsigned DEFAULT NULL, `PROCESSLIST_USER` varchar(16) DEFAULT NULL, `PROCESSLIST_HOST` varchar(60) DEFAULT NULL, `PROCESSLIST_DB` varchar(64) DEFAULT NULL, @@ -968,7 +1035,7 @@ threads CREATE TABLE `threads` ( `PROCESSLIST_TIME` bigint(20) DEFAULT NULL, `PROCESSLIST_STATE` varchar(64) DEFAULT NULL, `PROCESSLIST_INFO` longtext, - `PARENT_THREAD_ID` int(11) DEFAULT NULL, + `PARENT_THREAD_ID` bigint(20) unsigned DEFAULT NULL, `ROLE` varchar(64) DEFAULT NULL, `INSTRUMENTED` enum('YES','NO') NOT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 diff --git a/mysql-test/suite/perfschema/r/short_option_1.result b/mysql-test/suite/perfschema/r/short_option_1.result index 6004dc96327..a64ff442dec 100644 --- a/mysql-test/suite/perfschema/r/short_option_1.result +++ b/mysql-test/suite/perfschema/r/short_option_1.result @@ -15,10 +15,12 @@ Variable_name Value character_set_system utf8 show variables like 'log'; Variable_name Value -log ON 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/stage_mdl_table.result b/mysql-test/suite/perfschema/r/stage_mdl_table.result index b64d94f406c..20bb91159da 100644 --- a/mysql-test/suite/perfschema/r/stage_mdl_table.result +++ b/mysql-test/suite/perfschema/r/stage_mdl_table.result @@ -34,4 +34,7 @@ user2 stage/sql/checking permissions STATEMENT user2 stage/sql/checking permissions STATEMENT user2 stage/sql/init STATEMENT user2 stage/sql/Opening tables STATEMENT +user2 stage/sql/setup STATEMENT +user2 stage/sql/creating table STATEMENT +user2 stage/sql/After create STATEMENT commit; 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 48501d2ae26..a04e50083b1 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_idle.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_idle.result @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 f03b7b27546..61bab26b6b6 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_stages.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_stages.result @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 46ddeb32c08..fb4e3adb3bf 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_statements.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_statements.result @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 00d98b6af78..2ce9fe0f265 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_waits.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_waits.result @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 diff --git a/mysql-test/suite/perfschema/r/start_server_innodb.result b/mysql-test/suite/perfschema/r/start_server_innodb.result index da836c0f933..319485d1a55 100644 --- a/mysql-test/suite/perfschema/r/start_server_innodb.result +++ b/mysql-test/suite/perfschema/r/start_server_innodb.result @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -115,6 +119,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 201df2c98bd..bf4bb7568af 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_account.result +++ b/mysql-test/suite/perfschema/r/start_server_no_account.result @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 e8ee3d0e429..2b3aefc819b 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 5bc02d14e7e..6e4b90147b4 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 diff --git a/mysql-test/suite/perfschema/r/start_server_no_digests.result b/mysql-test/suite/perfschema/r/start_server_no_digests.result index 38d6d2750f6..4f6fa9bc5da 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_digests.result +++ b/mysql-test/suite/perfschema/r/start_server_no_digests.result @@ -8,6 +8,9 @@ CREATE TABLE t2(a int); CREATE TABLE t3(a int, b int); CREATE TABLE t4(a int, b int); CREATE TABLE t5(a int, b int, c int); +CREATE TABLE t6(a int, b int, c int, d int); +CREATE TABLE t11 (c CHAR(4)); +CREATE TABLE t12 (c CHAR(4)); TRUNCATE TABLE performance_schema.events_statements_summary_by_digest; #################################### # EXECUTION @@ -35,6 +38,15 @@ INSERT INTO t1 VALUES (1), (2), (3); INSERT INTO t1 VALUES (1), (2), (3), (4); INSERT INTO t3 VALUES (1, 2), (3, 4), (5, 6); INSERT INTO t5 VALUES (1, 2, 3), (4, 5, 6), (7, 8, 9); +INSERT INTO t1 VALUES (NULL); +INSERT INTO t3 VALUES (NULL,NULL); +INSERT INTO t3 VALUES (1,NULL); +INSERT INTO t3 VALUES (NULL,1); +INSERT INTO t6 VALUES (NULL, NULL, NULL, NULL); +INSERT INTO t6 VALUES (1, NULL, NULL, NULL); +INSERT INTO t6 VALUES (NULL, 2, NULL, NULL); +INSERT INTO t6 VALUES (1, 2, 3, NULL); +INSERT INTO t6 VALUES (1, 2, NULL, 4); SELECT 1 + 1; 1 + 1 2 @@ -61,20 +73,45 @@ CREATE SCHEMA statements_digest_temp; DROP SCHEMA statements_digest_temp; CREATE DATABASE statements_digest_temp; DROP DATABASE statements_digest_temp; -SELECT 1 from t11; -ERROR 42S02: Table 'statements_digest.t11' doesn't exist -create table t11 (c char(4)); -create table t11 (c char(4)); -ERROR 42S01: Table 't11' already exists -insert into t11 values("MySQL"); +SELECT 1 FROM no_such_table; +ERROR 42S02: Table 'statements_digest.no_such_table' doesn't exist +CREATE TABLE dup_table (c char(4)); +CREATE TABLE dup_table (c char(4)); +ERROR 42S01: Table 'dup_table' already exists +DROP TABLE dup_table; +INSERT INTO t11 VALUES("MySQL"); Warnings: Warning 1265 Data truncated for column 'c' at row 1 +PREPARE stmt FROM "SELECT * FROM t12"; +EXECUTE stmt; +c +EXECUTE stmt; +c +DEALLOCATE PREPARE stmt; +CREATE PROCEDURE p1() BEGIN SELECT * FROM t12; END// +CALL p1(); +c +CALL p1(); +c +DROP PROCEDURE p1; +CREATE FUNCTION `func`(a INT, b INT) RETURNS int(11) RETURN a+b // +select func(3,4); +func(3,4) +7 +select func(13,42); +func(13,42) +55 +DROP FUNCTION func; +CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @a:=1; +INSERT INTO t12 VALUES ("abc"); +INSERT INTO t12 VALUES ("def"); +DROP TRIGGER trg; #################################### # QUERYING PS STATEMENT DIGEST #################################### -SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, +SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; -DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS +SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS SHOW VARIABLES LIKE "performance_schema_digests_size"; Variable_name Value performance_schema_digests_size 0 @@ -89,4 +126,7 @@ DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t3; DROP TABLE IF EXISTS t4; DROP TABLE IF EXISTS t5; +DROP TABLE IF EXISTS t6; +DROP TABLE IF EXISTS t11; +DROP TABLE IF EXISTS t12; DROP DATABASE IF EXISTS statements_digest; 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 64d99d2109a..4e093920917 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 388ab1796b6..040b3edcb43 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 b09adcfe953..5b5195ff795 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_host.result +++ b/mysql-test/suite/perfschema/r/start_server_no_host.result @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 e4264ad0554..235174f5b87 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 4a642fda1e1..3ea5aafaed3 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 79636014743..355b174bb5b 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 88003d2978c..8e13b3ae51d 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 47b5c326703..3808b799fdb 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 0 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 66adafb7dd5..b83dfd1ba4b 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 0 performance_schema_users_size 100 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 612cc625132..37e0c755ca9 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 981b322041c..585cc1d5281 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 172f3e87d13..2f80e999077 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 8f3bd08a5de..0c1d772434c 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 1cd07ad93a6..3b7653cd4f7 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 diff --git a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result index f918d5a47f1..11113ef5d7d 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -95,6 +98,7 @@ performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 d2d0bd012c7..6b6546e3155 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 16eb55d80e4..3955e70d6ed 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 23248e97911..4b037a188bb 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 0 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 4cfe58e360a..5bb2e9c7ecf 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 0 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 98cc88ec36a..588e7ef63fa 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 0 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 dd22fb22773..31003b3070a 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 0 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 de1f2dc0b6f..a6eb3bac16e 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_user.result +++ b/mysql-test/suite/perfschema/r/start_server_no_user.result @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 0 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 36a8307de13..8906341bc8f 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 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 5954fe64333..d669bf50b2f 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 @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 diff --git a/mysql-test/suite/perfschema/r/start_server_nothing.result b/mysql-test/suite/perfschema/r/start_server_nothing.result index 6d81d08d30e..4e6994d670e 100644 --- a/mysql-test/suite/perfschema/r/start_server_nothing.result +++ b/mysql-test/suite/perfschema/r/start_server_nothing.result @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -95,6 +98,7 @@ performance_schema_max_table_handles 0 performance_schema_max_table_instances 0 performance_schema_max_thread_classes 0 performance_schema_max_thread_instances 0 +performance_schema_session_connect_attrs_size 0 performance_schema_setup_actors_size 0 performance_schema_setup_objects_size 0 performance_schema_users_size 0 @@ -129,6 +133,7 @@ performance_schema_max_table_handles 0 performance_schema_max_table_instances 0 performance_schema_max_thread_classes 0 performance_schema_max_thread_instances 0 +performance_schema_session_connect_attrs_size 0 performance_schema_setup_actors_size 0 performance_schema_setup_objects_size 0 performance_schema_users_size 0 @@ -158,12 +163,12 @@ events_waits_history_long YES global_instrumentation YES thread_instrumentation YES statements_digest YES -select * from performance_schema.setup_timers; -NAME TIMER_NAME -idle MICROSECOND -wait CYCLE -stage NANOSECOND -statement NANOSECOND +select NAME from performance_schema.setup_timers; +NAME +idle +wait +stage +statement select * from performance_schema.accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS select * from performance_schema.cond_instances; @@ -227,6 +232,10 @@ select * from performance_schema.file_summary_by_event_name; EVENT_NAME 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 select * from performance_schema.file_summary_by_instance; 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 +select * from performance_schema.session_account_connect_attrs; +PROCESSLIST_ID ATTR_NAME ATTR_VALUE ORDINAL_POSITION +select * from performance_schema.session_connect_attrs; +PROCESSLIST_ID ATTR_NAME ATTR_VALUE ORDINAL_POSITION select * from performance_schema.socket_instances; EVENT_NAME OBJECT_INSTANCE_BEGIN THREAD_ID SOCKET_ID IP PORT STATE select * from performance_schema.socket_summary_by_instance; diff --git a/mysql-test/suite/perfschema/r/start_server_off.result b/mysql-test/suite/perfschema/r/start_server_off.result index ad019bbc650..57fa6444318 100644 --- a/mysql-test/suite/perfschema/r/start_server_off.result +++ b/mysql-test/suite/perfschema/r/start_server_off.result @@ -7,16 +7,16 @@ performance_schema test select count(*) from performance_schema.performance_timers; count(*) -5 +0 select count(*) from performance_schema.setup_consumers; count(*) -12 +0 select count(*) > 3 from performance_schema.setup_instruments; count(*) > 3 0 select count(*) from performance_schema.setup_timers; count(*) -4 +0 select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -115,6 +119,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -126,18 +131,6 @@ Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 select * from performance_schema.setup_consumers; NAME ENABLED -events_stages_current NO -events_stages_history NO -events_stages_history_long NO -events_statements_current NO -events_statements_history NO -events_statements_history_long NO -events_waits_current NO -events_waits_history NO -events_waits_history_long NO -global_instrumentation NO -thread_instrumentation NO -statements_digest YES select * from performance_schema.setup_instruments; NAME ENABLED TIMED select * from performance_schema.setup_actors; @@ -146,7 +139,20 @@ select * from performance_schema.setup_objects; OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME ENABLED TIMED select * from performance_schema.setup_timers; NAME TIMER_NAME -idle MICROSECOND -wait CYCLE -stage NANOSECOND -statement NANOSECOND +insert into performance_schema.setup_objects values ('TABLE', 'myschema', 'myobject', 'YES', 'YES'); +ERROR HY000: Invalid performance_schema usage. +insert into performance_schema.setup_actors values ('myhost', 'mysuser', 'myrole'); +ERROR HY000: Invalid performance_schema usage. +select * from performance_schema.setup_objects; +OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME ENABLED TIMED +update performance_schema.setup_objects set OBJECT_NAME = 'myobject'; +delete from performance_schema.setup_objects; +select * from performance_schema.setup_actors; +HOST USER ROLE +update performance_schema.setup_actors set HOST = 'myhost'; +delete from performance_schema.setup_actors; +truncate performance_schema.events_stages_history_long; +truncate performance_schema.events_statements_history_long; +truncate performance_schema.events_waits_history_long; +truncate performance_schema.setup_objects; +truncate performance_schema.setup_actors; diff --git a/mysql-test/suite/perfschema/r/start_server_on.result b/mysql-test/suite/perfschema/r/start_server_on.result index da836c0f933..319485d1a55 100644 --- a/mysql-test/suite/perfschema/r/start_server_on.result +++ b/mysql-test/suite/perfschema/r/start_server_on.result @@ -31,6 +31,7 @@ select * from performance_schema.events_statements_current; select * from performance_schema.events_statements_history; select * from performance_schema.events_statements_history_long; select * from performance_schema.events_statements_summary_by_account_by_event_name; +select * from performance_schema.events_statements_summary_by_digest; select * from performance_schema.events_statements_summary_by_host_by_event_name; select * from performance_schema.events_statements_summary_by_thread_by_event_name; select * from performance_schema.events_statements_summary_by_user_by_event_name; @@ -48,19 +49,21 @@ select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; select * from performance_schema.host_cache; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.hosts; select * from performance_schema.mutex_instances; select * from performance_schema.objects_summary_global_by_type; select * from performance_schema.performance_timers; select * from performance_schema.rwlock_instances; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.setup_actors; select * from performance_schema.setup_consumers; select * from performance_schema.setup_instruments; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; +select * from performance_schema.socket_instances; +select * from performance_schema.socket_summary_by_instance; +select * from performance_schema.socket_summary_by_event_name; select * from performance_schema.table_io_waits_summary_by_index_usage; select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; @@ -90,11 +93,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -115,6 +119,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/statement_digest.result b/mysql-test/suite/perfschema/r/statement_digest.result index 48cdc22bd21..699add920d2 100644 --- a/mysql-test/suite/perfschema/r/statement_digest.result +++ b/mysql-test/suite/perfschema/r/statement_digest.result @@ -8,6 +8,9 @@ CREATE TABLE t2(a int); CREATE TABLE t3(a int, b int); CREATE TABLE t4(a int, b int); CREATE TABLE t5(a int, b int, c int); +CREATE TABLE t6(a int, b int, c int, d int); +CREATE TABLE t11 (c CHAR(4)); +CREATE TABLE t12 (c CHAR(4)); TRUNCATE TABLE performance_schema.events_statements_summary_by_digest; #################################### # EXECUTION @@ -35,6 +38,15 @@ INSERT INTO t1 VALUES (1), (2), (3); INSERT INTO t1 VALUES (1), (2), (3), (4); INSERT INTO t3 VALUES (1, 2), (3, 4), (5, 6); INSERT INTO t5 VALUES (1, 2, 3), (4, 5, 6), (7, 8, 9); +INSERT INTO t1 VALUES (NULL); +INSERT INTO t3 VALUES (NULL,NULL); +INSERT INTO t3 VALUES (1,NULL); +INSERT INTO t3 VALUES (NULL,1); +INSERT INTO t6 VALUES (NULL, NULL, NULL, NULL); +INSERT INTO t6 VALUES (1, NULL, NULL, NULL); +INSERT INTO t6 VALUES (NULL, 2, NULL, NULL); +INSERT INTO t6 VALUES (1, 2, 3, NULL); +INSERT INTO t6 VALUES (1, 2, NULL, 4); SELECT 1 + 1; 1 + 1 2 @@ -61,42 +73,82 @@ CREATE SCHEMA statements_digest_temp; DROP SCHEMA statements_digest_temp; CREATE DATABASE statements_digest_temp; DROP DATABASE statements_digest_temp; -SELECT 1 from t11; -ERROR 42S02: Table 'statements_digest.t11' doesn't exist -create table t11 (c char(4)); -create table t11 (c char(4)); -ERROR 42S01: Table 't11' already exists -insert into t11 values("MySQL"); +SELECT 1 FROM no_such_table; +ERROR 42S02: Table 'statements_digest.no_such_table' doesn't exist +CREATE TABLE dup_table (c char(4)); +CREATE TABLE dup_table (c char(4)); +ERROR 42S01: Table 'dup_table' already exists +DROP TABLE dup_table; +INSERT INTO t11 VALUES("MySQL"); Warnings: Warning 1265 Data truncated for column 'c' at row 1 +PREPARE stmt FROM "SELECT * FROM t12"; +EXECUTE stmt; +c +EXECUTE stmt; +c +DEALLOCATE PREPARE stmt; +CREATE PROCEDURE p1() BEGIN SELECT * FROM t12; END// +CALL p1(); +c +CALL p1(); +c +DROP PROCEDURE p1; +CREATE FUNCTION `func`(a INT, b INT) RETURNS int(11) RETURN a+b // +select func(3,4); +func(3,4) +7 +select func(13,42); +func(13,42) +55 +DROP FUNCTION func; +CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @a:=1; +INSERT INTO t12 VALUES ("abc"); +INSERT INTO t12 VALUES ("def"); +DROP TRIGGER trg; #################################### # QUERYING PS STATEMENT DIGEST #################################### -SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, +SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; -DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS -169378b8f621f69e494b409cac921a8a TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 -e4be9763aa1ac0b1240df516b56c87f7 SELECT ? FROM t1 1 0 0 0 -4b427080de408a9901110476b8d89294 SELECT ? FROM `t1` 1 0 0 0 -40f18ff66269a8b98e55adddd015b34e SELECT ?, ... FROM t1 2 0 0 0 -e987e8bf850f505f6f77eb07a7bbe04a SELECT ? FROM t2 1 0 0 0 -607f77cb3413947bd5dbd63f76612f8a SELECT ?, ... FROM t2 2 0 0 0 -f42737acdd47cab2d221cd39090bbded INSERT INTO t1 VALUES (?) 1 1 0 0 -7370fb00cd852c6997143c4d2fdbd195 INSERT INTO t2 VALUES (?) 1 1 0 0 -d081782e520e5b728af90727126d4e29 INSERT INTO t3 VALUES (...) 1 1 0 0 -523f7d6062fa7d22b4d52aff8d86822a INSERT INTO t4 VALUES (...) 1 1 0 0 -b5ca6eebd080515a634701700781f06a INSERT INTO t5 VALUES (...) 1 1 0 0 -89b024c9cb432b7d8a5bb8c2d669681b INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0 -77ecbf7f22a1336af595d5d5a3289e3b INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0 -239f41ec764182041ee7fdd8d949cc5c INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0 -e0d2d03f8bb2fd3d349ddd73a950a9e9 SELECT ? + ? 3 0 0 0 -c5bd0023064662b510b51696f1156a4b SELECT ? 1 0 0 0 -4ffe9781212ce310328413c9177c433f CREATE SCHEMA statements_digest_temp 2 2 0 0 -3080b4ad1ab930bea0de4df1a4e28545 DROP SCHEMA statements_digest_temp 2 0 0 0 -6f670a13be2183ac28f11ff5264c24b5 SELECT ? FROM t11 1 0 0 1 -7721a3a30656deccf166c8706c87aca5 CREATE TABLE t11 ( c CHARACTER (?) ) 2 0 0 1 -e563777e3c11d2b111f1dd6ca27da9d7 INSERT INTO t11 VALUES (?) 1 1 1 0 -f4a01378d55fccee18a4d359d3aa49c0 SHOW WARNINGS 1 0 0 0 +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 #################################### # CLEANUP #################################### @@ -105,4 +157,7 @@ DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t3; DROP TABLE IF EXISTS t4; DROP TABLE IF EXISTS t5; +DROP TABLE IF EXISTS t6; +DROP TABLE IF EXISTS t11; +DROP TABLE IF EXISTS t12; DROP DATABASE IF EXISTS statements_digest; diff --git a/mysql-test/suite/perfschema/r/statement_digest_consumers.result b/mysql-test/suite/perfschema/r/statement_digest_consumers.result index 8c9388497d8..3f5b730510b 100644 --- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result +++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result @@ -8,6 +8,9 @@ CREATE TABLE t2(a int); CREATE TABLE t3(a int, b int); CREATE TABLE t4(a int, b int); CREATE TABLE t5(a int, b int, c int); +CREATE TABLE t6(a int, b int, c int, d int); +CREATE TABLE t11 (c CHAR(4)); +CREATE TABLE t12 (c CHAR(4)); SELECT * FROM performance_schema.setup_consumers; NAME ENABLED events_stages_current YES @@ -49,6 +52,15 @@ INSERT INTO t1 VALUES (1), (2), (3); INSERT INTO t1 VALUES (1), (2), (3), (4); INSERT INTO t3 VALUES (1, 2), (3, 4), (5, 6); INSERT INTO t5 VALUES (1, 2, 3), (4, 5, 6), (7, 8, 9); +INSERT INTO t1 VALUES (NULL); +INSERT INTO t3 VALUES (NULL,NULL); +INSERT INTO t3 VALUES (1,NULL); +INSERT INTO t3 VALUES (NULL,1); +INSERT INTO t6 VALUES (NULL, NULL, NULL, NULL); +INSERT INTO t6 VALUES (1, NULL, NULL, NULL); +INSERT INTO t6 VALUES (NULL, 2, NULL, NULL); +INSERT INTO t6 VALUES (1, 2, 3, NULL); +INSERT INTO t6 VALUES (1, 2, NULL, 4); SELECT 1 + 1; 1 + 1 2 @@ -75,41 +87,81 @@ CREATE SCHEMA statements_digest_temp; DROP SCHEMA statements_digest_temp; CREATE DATABASE statements_digest_temp; DROP DATABASE statements_digest_temp; -SELECT 1 from t11; -ERROR 42S02: Table 'statements_digest.t11' doesn't exist -create table t11 (c char(4)); -create table t11 (c char(4)); -ERROR 42S01: Table 't11' already exists -insert into t11 values("MySQL"); +SELECT 1 FROM no_such_table; +ERROR 42S02: Table 'statements_digest.no_such_table' doesn't exist +CREATE TABLE dup_table (c char(4)); +CREATE TABLE dup_table (c char(4)); +ERROR 42S01: Table 'dup_table' already exists +DROP TABLE dup_table; +INSERT INTO t11 VALUES("MySQL"); Warnings: Warning 1265 Data truncated for column 'c' at row 1 +PREPARE stmt FROM "SELECT * FROM t12"; +EXECUTE stmt; +c +EXECUTE stmt; +c +DEALLOCATE PREPARE stmt; +CREATE PROCEDURE p1() BEGIN SELECT * FROM t12; END// +CALL p1(); +c +CALL p1(); +c +DROP PROCEDURE p1; +CREATE FUNCTION `func`(a INT, b INT) RETURNS int(11) RETURN a+b // +select func(3,4); +func(3,4) +7 +select func(13,42); +func(13,42) +55 +DROP FUNCTION func; +CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @a:=1; +INSERT INTO t12 VALUES ("abc"); +INSERT INTO t12 VALUES ("def"); +DROP TRIGGER trg; #################################### # QUERYING PS STATEMENT DIGEST #################################### -SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest; -digest digest_text count_star -169378b8f621f69e494b409cac921a8a TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 -e4be9763aa1ac0b1240df516b56c87f7 SELECT ? FROM t1 1 -4b427080de408a9901110476b8d89294 SELECT ? FROM `t1` 1 -40f18ff66269a8b98e55adddd015b34e SELECT ?, ... FROM t1 2 -e987e8bf850f505f6f77eb07a7bbe04a SELECT ? FROM t2 1 -607f77cb3413947bd5dbd63f76612f8a SELECT ?, ... FROM t2 2 -f42737acdd47cab2d221cd39090bbded INSERT INTO t1 VALUES (?) 1 -7370fb00cd852c6997143c4d2fdbd195 INSERT INTO t2 VALUES (?) 1 -d081782e520e5b728af90727126d4e29 INSERT INTO t3 VALUES (...) 1 -523f7d6062fa7d22b4d52aff8d86822a INSERT INTO t4 VALUES (...) 1 -b5ca6eebd080515a634701700781f06a INSERT INTO t5 VALUES (...) 1 -89b024c9cb432b7d8a5bb8c2d669681b INSERT INTO t1 VALUES (?) /* , ... */ 2 -77ecbf7f22a1336af595d5d5a3289e3b INSERT INTO t3 VALUES (...) /* , ... */ 1 -239f41ec764182041ee7fdd8d949cc5c INSERT INTO t5 VALUES (...) /* , ... */ 1 -e0d2d03f8bb2fd3d349ddd73a950a9e9 SELECT ? + ? 3 -c5bd0023064662b510b51696f1156a4b SELECT ? 1 -4ffe9781212ce310328413c9177c433f CREATE SCHEMA statements_digest_temp 2 -3080b4ad1ab930bea0de4df1a4e28545 DROP SCHEMA statements_digest_temp 2 -6f670a13be2183ac28f11ff5264c24b5 SELECT ? FROM t11 1 -7721a3a30656deccf166c8706c87aca5 CREATE TABLE t11 ( c CHARACTER (?) ) 2 -e563777e3c11d2b111f1dd6ca27da9d7 INSERT INTO t11 VALUES (?) 1 -f4a01378d55fccee18a4d359d3aa49c0 SHOW WARNINGS 1 +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 SELECT digest, digest_text FROM performance_schema.events_statements_current; digest digest_text #################################### @@ -120,4 +172,7 @@ DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t3; DROP TABLE IF EXISTS t4; DROP TABLE IF EXISTS t5; +DROP TABLE IF EXISTS t6; +DROP TABLE IF EXISTS t11; +DROP TABLE IF EXISTS t12; DROP DATABASE IF EXISTS statements_digest; diff --git a/mysql-test/suite/perfschema/r/statement_digest_consumers2.result b/mysql-test/suite/perfschema/r/statement_digest_consumers2.result index 57c92aca988..434914c65e7 100644 --- a/mysql-test/suite/perfschema/r/statement_digest_consumers2.result +++ b/mysql-test/suite/perfschema/r/statement_digest_consumers2.result @@ -8,6 +8,9 @@ CREATE TABLE t2(a int); CREATE TABLE t3(a int, b int); CREATE TABLE t4(a int, b int); CREATE TABLE t5(a int, b int, c int); +CREATE TABLE t6(a int, b int, c int, d int); +CREATE TABLE t11 (c CHAR(4)); +CREATE TABLE t12 (c CHAR(4)); SELECT * FROM performance_schema.setup_consumers; NAME ENABLED events_stages_current YES @@ -49,6 +52,15 @@ INSERT INTO t1 VALUES (1), (2), (3); INSERT INTO t1 VALUES (1), (2), (3), (4); INSERT INTO t3 VALUES (1, 2), (3, 4), (5, 6); INSERT INTO t5 VALUES (1, 2, 3), (4, 5, 6), (7, 8, 9); +INSERT INTO t1 VALUES (NULL); +INSERT INTO t3 VALUES (NULL,NULL); +INSERT INTO t3 VALUES (1,NULL); +INSERT INTO t3 VALUES (NULL,1); +INSERT INTO t6 VALUES (NULL, NULL, NULL, NULL); +INSERT INTO t6 VALUES (1, NULL, NULL, NULL); +INSERT INTO t6 VALUES (NULL, 2, NULL, NULL); +INSERT INTO t6 VALUES (1, 2, 3, NULL); +INSERT INTO t6 VALUES (1, 2, NULL, 4); SELECT 1 + 1; 1 + 1 2 @@ -75,19 +87,44 @@ CREATE SCHEMA statements_digest_temp; DROP SCHEMA statements_digest_temp; CREATE DATABASE statements_digest_temp; DROP DATABASE statements_digest_temp; -SELECT 1 from t11; -ERROR 42S02: Table 'statements_digest.t11' doesn't exist -create table t11 (c char(4)); -create table t11 (c char(4)); -ERROR 42S01: Table 't11' already exists -insert into t11 values("MySQL"); +SELECT 1 FROM no_such_table; +ERROR 42S02: Table 'statements_digest.no_such_table' doesn't exist +CREATE TABLE dup_table (c char(4)); +CREATE TABLE dup_table (c char(4)); +ERROR 42S01: Table 'dup_table' already exists +DROP TABLE dup_table; +INSERT INTO t11 VALUES("MySQL"); Warnings: Warning 1265 Data truncated for column 'c' at row 1 +PREPARE stmt FROM "SELECT * FROM t12"; +EXECUTE stmt; +c +EXECUTE stmt; +c +DEALLOCATE PREPARE stmt; +CREATE PROCEDURE p1() BEGIN SELECT * FROM t12; END// +CALL p1(); +c +CALL p1(); +c +DROP PROCEDURE p1; +CREATE FUNCTION `func`(a INT, b INT) RETURNS int(11) RETURN a+b // +select func(3,4); +func(3,4) +7 +select func(13,42); +func(13,42) +55 +DROP FUNCTION func; +CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @a:=1; +INSERT INTO t12 VALUES ("abc"); +INSERT INTO t12 VALUES ("def"); +DROP TRIGGER trg; #################################### # QUERYING PS STATEMENT DIGEST #################################### -SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest; -digest digest_text count_star +SELECT schema_name, digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest; +schema_name digest digest_text count_star SELECT digest, digest_text FROM performance_schema.events_statements_current; digest digest_text NULL NULL @@ -99,4 +136,7 @@ DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t3; DROP TABLE IF EXISTS t4; DROP TABLE IF EXISTS t5; +DROP TABLE IF EXISTS t6; +DROP TABLE IF EXISTS t11; +DROP TABLE IF EXISTS t12; DROP DATABASE IF EXISTS statements_digest; 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 df35fd23418..ee2ec56eaeb 100644 --- a/mysql-test/suite/perfschema/r/statement_digest_long_query.result +++ b/mysql-test/suite/perfschema/r/statement_digest_long_query.result @@ -6,7 +6,7 @@ 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 #################################### # QUERYING PS STATEMENT DIGEST #################################### -SELECT digest, digest_text, count_star FROM events_statements_summary_by_digest; -digest digest_text count_star -2b59f75dae5f99499a30ee9d7dad331c TRUNCATE TABLE events_statements_summary_by_digest 1 -2aa8806683d087e099c1e389ccf1b5a8 SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ... 1 +SELECT schema_name, digest, digest_text, count_star FROM events_statements_summary_by_digest; +schema_name digest digest_text count_star +performance_schema 8c593fa65389c64665e8f13cf4b3e266 TRUNCATE TABLE events_statements_summary_by_digest 1 +performance_schema 24322df0b587ab9c93670a4d074e28ec 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 98f21895e81..9ba298768eb 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,11 +63,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -86,6 +87,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1731,6 +1733,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 6d983b32bd3..70c58d72b1f 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,11 +62,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -85,6 +86,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1730,6 +1732,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 45935f943ff..4b4f79387a7 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,11 +63,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -86,6 +87,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1731,6 +1733,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 6feab956ef3..b6a7c699fb2 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,11 +62,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -85,6 +86,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1730,6 +1732,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 50217f4fb32..a82463edc0b 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,11 +61,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -84,6 +85,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1805,6 +1807,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 47bd8f84455..32e3fc40f40 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,11 +60,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -83,6 +84,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1842,6 +1844,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 26e86a12f24..5b5ccc65b87 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,11 +61,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -84,6 +85,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1805,6 +1807,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 67a80884008..0b6d306ffd3 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,11 +60,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -83,6 +84,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1842,6 +1844,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_off.result b/mysql-test/suite/perfschema/r/table_aggregate_off.result index 8c2ff29c2ce..a704ec101ac 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_off.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_off.result @@ -62,11 +62,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -85,6 +86,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1730,6 +1732,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 31b43996de4..95616f40e3b 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,11 +63,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -86,6 +87,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1731,6 +1733,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 1379d07719a..02140a27253 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,11 +62,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -85,6 +86,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1730,6 +1732,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 3001ad34e68..921e61cce30 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,11 +63,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -86,6 +87,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1731,6 +1733,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 feed7c53c93..c031f1e7e0c 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,11 +62,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -85,6 +86,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1730,6 +1732,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 dac12573832..4ecde5743c9 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,11 +65,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -88,6 +89,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1733,6 +1735,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 1f3e0fb9ef1..4529ab331f2 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,11 +64,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -87,6 +88,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1732,6 +1734,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 ee7958082f6..c9543d5f303 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,11 +65,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -88,6 +89,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1733,6 +1735,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 ee04ee712f0..27494d52653 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,11 +64,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -87,6 +88,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1732,6 +1734,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 9c1fbf6d557..c0b67ac5e8e 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,11 +63,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -86,6 +87,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1769,6 +1771,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 d537088ddfd..5096019d0aa 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,11 +62,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -85,6 +86,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1787,6 +1789,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 217cbced878..a9b9e0897c7 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,11 +63,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -86,6 +87,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1769,6 +1771,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 f25669430a0..9a9bc0c4dbb 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,11 +62,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -85,6 +86,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1787,6 +1789,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 681a9019281..2588e19ba29 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,11 +65,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -88,6 +89,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1733,6 +1735,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 a852647f566..c60125e6fea 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,11 +64,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -87,6 +88,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1732,6 +1734,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 caedc66d8a7..30e9dd0bb48 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,11 +65,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -88,6 +89,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1733,6 +1735,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 1b860c73ae6..01b109d1418 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,11 +64,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -87,6 +88,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1732,6 +1734,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 777a169c194..1b8ccfcf20e 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,11 +65,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -88,6 +89,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1733,6 +1735,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 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 ad08341c159..4a8b85c62fd 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,11 +64,12 @@ 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 173 +performance_schema_max_statement_classes 174 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 @@ -87,6 +88,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 @@ -1732,6 +1734,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/table_schema.result b/mysql-test/suite/perfschema/r/table_schema.result index 2580b9eeff8..faf0a384503 100644 --- a/mysql-test/suite/perfschema/r/table_schema.result +++ b/mysql-test/suite/perfschema/r/table_schema.result @@ -7,7 +7,7 @@ def performance_schema accounts CURRENT_CONNECTIONS 3 NULL NO bigint NULL NULL 1 def performance_schema accounts TOTAL_CONNECTIONS 4 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references def performance_schema cond_instances NAME 1 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references def performance_schema cond_instances OBJECT_INSTANCE_BEGIN 2 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_stages_current THREAD_ID 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema events_stages_current THREAD_ID 1 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_current EVENT_ID 2 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_current END_EVENT_ID 3 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_current EVENT_NAME 4 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references @@ -17,7 +17,7 @@ def performance_schema events_stages_current TIMER_END 7 NULL YES bigint NULL NU def performance_schema events_stages_current TIMER_WAIT 8 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_current NESTING_EVENT_ID 9 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_current NESTING_EVENT_TYPE 10 NULL YES enum 9 27 NULL NULL NULL utf8 utf8_general_ci enum('STATEMENT','STAGE','WAIT') select,insert,update,references -def performance_schema events_stages_history THREAD_ID 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema events_stages_history THREAD_ID 1 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_history EVENT_ID 2 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_history END_EVENT_ID 3 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_history EVENT_NAME 4 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references @@ -27,7 +27,7 @@ def performance_schema events_stages_history TIMER_END 7 NULL YES bigint NULL NU def performance_schema events_stages_history TIMER_WAIT 8 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_history NESTING_EVENT_ID 9 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_history NESTING_EVENT_TYPE 10 NULL YES enum 9 27 NULL NULL NULL utf8 utf8_general_ci enum('STATEMENT','STAGE','WAIT') select,insert,update,references -def performance_schema events_stages_history_long THREAD_ID 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema events_stages_history_long THREAD_ID 1 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_history_long EVENT_ID 2 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_history_long END_EVENT_ID 3 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_history_long EVENT_NAME 4 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references @@ -52,7 +52,7 @@ def performance_schema events_stages_summary_by_host_by_event_name SUM_TIMER_WAI def performance_schema events_stages_summary_by_host_by_event_name MIN_TIMER_WAIT 5 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_summary_by_host_by_event_name AVG_TIMER_WAIT 6 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_summary_by_host_by_event_name MAX_TIMER_WAIT 7 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_stages_summary_by_thread_by_event_name THREAD_ID 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema events_stages_summary_by_thread_by_event_name THREAD_ID 1 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_summary_by_thread_by_event_name EVENT_NAME 2 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references def performance_schema events_stages_summary_by_thread_by_event_name COUNT_STAR 3 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_summary_by_thread_by_event_name SUM_TIMER_WAIT 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references @@ -72,7 +72,7 @@ def performance_schema events_stages_summary_global_by_event_name SUM_TIMER_WAIT def performance_schema events_stages_summary_global_by_event_name MIN_TIMER_WAIT 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_summary_global_by_event_name AVG_TIMER_WAIT 5 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_stages_summary_global_by_event_name MAX_TIMER_WAIT 6 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_current THREAD_ID 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema events_statements_current THREAD_ID 1 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_current EVENT_ID 2 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_current END_EVENT_ID 3 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_current EVENT_NAME 4 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references @@ -112,7 +112,7 @@ def performance_schema events_statements_current NO_INDEX_USED 37 NULL NO bigint def performance_schema events_statements_current NO_GOOD_INDEX_USED 38 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_current NESTING_EVENT_ID 39 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_current NESTING_EVENT_TYPE 40 NULL YES enum 9 27 NULL NULL NULL utf8 utf8_general_ci enum('STATEMENT','STAGE','WAIT') select,insert,update,references -def performance_schema events_statements_history THREAD_ID 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema events_statements_history THREAD_ID 1 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_history EVENT_ID 2 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_history END_EVENT_ID 3 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_history EVENT_NAME 4 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references @@ -152,7 +152,7 @@ def performance_schema events_statements_history NO_INDEX_USED 37 NULL NO bigint def performance_schema events_statements_history NO_GOOD_INDEX_USED 38 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_history NESTING_EVENT_ID 39 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_history NESTING_EVENT_TYPE 40 NULL YES enum 9 27 NULL NULL NULL utf8 utf8_general_ci enum('STATEMENT','STAGE','WAIT') select,insert,update,references -def performance_schema events_statements_history_long THREAD_ID 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema events_statements_history_long THREAD_ID 1 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_history_long EVENT_ID 2 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_history_long END_EVENT_ID 3 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_history_long EVENT_NAME 4 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references @@ -219,34 +219,35 @@ def performance_schema events_statements_summary_by_account_by_event_name SUM_SO def performance_schema events_statements_summary_by_account_by_event_name SUM_SORT_SCAN 25 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_summary_by_account_by_event_name SUM_NO_INDEX_USED 26 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_summary_by_account_by_event_name SUM_NO_GOOD_INDEX_USED 27 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest DIGEST 1 NULL YES varchar 32 96 NULL NULL NULL utf8 utf8_general_ci varchar(32) select,insert,update,references -def performance_schema events_statements_summary_by_digest DIGEST_TEXT 2 NULL YES longtext 4294967295 4294967295 NULL NULL NULL utf8 utf8_general_ci longtext select,insert,update,references -def performance_schema events_statements_summary_by_digest COUNT_STAR 3 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_TIMER_WAIT 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest MIN_TIMER_WAIT 5 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest AVG_TIMER_WAIT 6 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest MAX_TIMER_WAIT 7 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_LOCK_TIME 8 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_ERRORS 9 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_WARNINGS 10 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_ROWS_AFFECTED 11 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_ROWS_SENT 12 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_ROWS_EXAMINED 13 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_CREATED_TMP_DISK_TABLES 14 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_CREATED_TMP_TABLES 15 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_SELECT_FULL_JOIN 16 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_SELECT_FULL_RANGE_JOIN 17 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_SELECT_RANGE 18 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_SELECT_RANGE_CHECK 19 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_SELECT_SCAN 20 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_SORT_MERGE_PASSES 21 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_SORT_RANGE 22 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_SORT_ROWS 23 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_SORT_SCAN 24 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_NO_INDEX_USED 25 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest SUM_NO_GOOD_INDEX_USED 26 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_digest FIRST_SEEN 27 0000-00-00 00:00:00 NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp select,insert,update,references -def performance_schema events_statements_summary_by_digest LAST_SEEN 28 0000-00-00 00:00:00 NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp select,insert,update,references +def performance_schema events_statements_summary_by_digest SCHEMA_NAME 1 NULL YES varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select,insert,update,references +def performance_schema events_statements_summary_by_digest DIGEST 2 NULL YES varchar 32 96 NULL NULL NULL utf8 utf8_general_ci varchar(32) select,insert,update,references +def performance_schema events_statements_summary_by_digest DIGEST_TEXT 3 NULL YES longtext 4294967295 4294967295 NULL NULL NULL utf8 utf8_general_ci longtext select,insert,update,references +def performance_schema events_statements_summary_by_digest COUNT_STAR 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_TIMER_WAIT 5 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest MIN_TIMER_WAIT 6 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest AVG_TIMER_WAIT 7 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest MAX_TIMER_WAIT 8 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_LOCK_TIME 9 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_ERRORS 10 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_WARNINGS 11 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_ROWS_AFFECTED 12 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_ROWS_SENT 13 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_ROWS_EXAMINED 14 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_CREATED_TMP_DISK_TABLES 15 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_CREATED_TMP_TABLES 16 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_SELECT_FULL_JOIN 17 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_SELECT_FULL_RANGE_JOIN 18 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_SELECT_RANGE 19 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_SELECT_RANGE_CHECK 20 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_SELECT_SCAN 21 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_SORT_MERGE_PASSES 22 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_SORT_RANGE 23 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_SORT_ROWS 24 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_SORT_SCAN 25 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_NO_INDEX_USED 26 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest SUM_NO_GOOD_INDEX_USED 27 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def performance_schema events_statements_summary_by_digest FIRST_SEEN 28 0000-00-00 00:00:00 NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp select,insert,update,references +def performance_schema events_statements_summary_by_digest LAST_SEEN 29 0000-00-00 00:00:00 NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp select,insert,update,references def performance_schema events_statements_summary_by_host_by_event_name HOST 1 NULL YES char 60 180 NULL NULL NULL utf8 utf8_bin char(60) select,insert,update,references def performance_schema events_statements_summary_by_host_by_event_name EVENT_NAME 2 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references def performance_schema events_statements_summary_by_host_by_event_name COUNT_STAR 3 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references @@ -273,7 +274,7 @@ def performance_schema events_statements_summary_by_host_by_event_name SUM_SORT_ def performance_schema events_statements_summary_by_host_by_event_name SUM_SORT_SCAN 24 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_summary_by_host_by_event_name SUM_NO_INDEX_USED 25 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_summary_by_host_by_event_name SUM_NO_GOOD_INDEX_USED 26 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_statements_summary_by_thread_by_event_name THREAD_ID 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema events_statements_summary_by_thread_by_event_name THREAD_ID 1 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_summary_by_thread_by_event_name EVENT_NAME 2 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references def performance_schema events_statements_summary_by_thread_by_event_name COUNT_STAR 3 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_summary_by_thread_by_event_name SUM_TIMER_WAIT 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references @@ -350,7 +351,7 @@ def performance_schema events_statements_summary_global_by_event_name SUM_SORT_R def performance_schema events_statements_summary_global_by_event_name SUM_SORT_SCAN 23 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_summary_global_by_event_name SUM_NO_INDEX_USED 24 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_statements_summary_global_by_event_name SUM_NO_GOOD_INDEX_USED 25 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_waits_current THREAD_ID 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema events_waits_current THREAD_ID 1 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_waits_current EVENT_ID 2 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_waits_current END_EVENT_ID 3 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_waits_current EVENT_NAME 4 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references @@ -369,7 +370,7 @@ def performance_schema events_waits_current NESTING_EVENT_TYPE 16 NULL YES enum def performance_schema events_waits_current OPERATION 17 NULL NO varchar 32 96 NULL NULL NULL utf8 utf8_general_ci varchar(32) select,insert,update,references def performance_schema events_waits_current NUMBER_OF_BYTES 18 NULL YES bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references def performance_schema events_waits_current FLAGS 19 NULL YES int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references -def performance_schema events_waits_history THREAD_ID 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema events_waits_history THREAD_ID 1 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_waits_history EVENT_ID 2 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_waits_history END_EVENT_ID 3 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_waits_history EVENT_NAME 4 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references @@ -388,7 +389,7 @@ def performance_schema events_waits_history NESTING_EVENT_TYPE 16 NULL YES enum def performance_schema events_waits_history OPERATION 17 NULL NO varchar 32 96 NULL NULL NULL utf8 utf8_general_ci varchar(32) select,insert,update,references def performance_schema events_waits_history NUMBER_OF_BYTES 18 NULL YES bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references def performance_schema events_waits_history FLAGS 19 NULL YES int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references -def performance_schema events_waits_history_long THREAD_ID 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema events_waits_history_long THREAD_ID 1 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_waits_history_long EVENT_ID 2 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_waits_history_long END_EVENT_ID 3 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_waits_history_long EVENT_NAME 4 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references @@ -429,7 +430,7 @@ def performance_schema events_waits_summary_by_instance SUM_TIMER_WAIT 4 NULL NO def performance_schema events_waits_summary_by_instance MIN_TIMER_WAIT 5 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_waits_summary_by_instance AVG_TIMER_WAIT 6 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_waits_summary_by_instance MAX_TIMER_WAIT 7 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema events_waits_summary_by_thread_by_event_name THREAD_ID 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema events_waits_summary_by_thread_by_event_name THREAD_ID 1 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_waits_summary_by_thread_by_event_name EVENT_NAME 2 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references def performance_schema events_waits_summary_by_thread_by_event_name COUNT_STAR 3 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema events_waits_summary_by_thread_by_event_name SUM_TIMER_WAIT 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references @@ -503,9 +504,38 @@ def performance_schema file_summary_by_instance MAX_TIMER_MISC 25 NULL NO bigint def performance_schema hosts HOST 1 NULL YES char 60 180 NULL NULL NULL utf8 utf8_bin char(60) select,insert,update,references def performance_schema hosts CURRENT_CONNECTIONS 2 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references def performance_schema hosts TOTAL_CONNECTIONS 3 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache IP 1 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select,insert,update,references +def performance_schema host_cache HOST 2 NULL YES varchar 255 765 NULL NULL NULL utf8 utf8_bin varchar(255) select,insert,update,references +def performance_schema host_cache HOST_VALIDATED 3 NULL NO enum 3 9 NULL NULL NULL utf8 utf8_general_ci enum('YES','NO') select,insert,update,references +def performance_schema host_cache SUM_CONNECT_ERRORS 4 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_HOST_BLOCKED_ERRORS 5 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_NAMEINFO_TRANSIENT_ERRORS 6 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_NAMEINFO_PERMANENT_ERRORS 7 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_FORMAT_ERRORS 8 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_ADDRINFO_TRANSIENT_ERRORS 9 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_ADDRINFO_PERMANENT_ERRORS 10 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_FCRDNS_ERRORS 11 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_HOST_ACL_ERRORS 12 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_NO_AUTH_PLUGIN_ERRORS 13 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_AUTH_PLUGIN_ERRORS 14 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_HANDSHAKE_ERRORS 15 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_PROXY_USER_ERRORS 16 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_PROXY_USER_ACL_ERRORS 17 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_AUTHENTICATION_ERRORS 18 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_SSL_ERRORS 19 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_MAX_USER_CONNECTIONS_ERRORS 20 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS 21 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_DEFAULT_DATABASE_ERRORS 22 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_INIT_CONNECT_ERRORS 23 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_LOCAL_ERRORS 24 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_UNKNOWN_ERRORS 25 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache FIRST_SEEN 26 0000-00-00 00:00:00 NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp select,insert,update,references +def performance_schema host_cache LAST_SEEN 27 0000-00-00 00:00:00 NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp select,insert,update,references +def performance_schema host_cache FIRST_ERROR_SEEN 28 0000-00-00 00:00:00 YES timestamp NULL NULL NULL NULL 0 NULL NULL timestamp select,insert,update,references +def performance_schema host_cache LAST_ERROR_SEEN 29 0000-00-00 00:00:00 YES timestamp NULL NULL NULL NULL 0 NULL NULL timestamp select,insert,update,references def performance_schema mutex_instances NAME 1 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references def performance_schema mutex_instances OBJECT_INSTANCE_BEGIN 2 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema mutex_instances LOCKED_BY_THREAD_ID 3 NULL YES int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema mutex_instances LOCKED_BY_THREAD_ID 3 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema objects_summary_global_by_type OBJECT_TYPE 1 NULL YES varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select,insert,update,references def performance_schema objects_summary_global_by_type OBJECT_SCHEMA 2 NULL YES varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select,insert,update,references def performance_schema objects_summary_global_by_type OBJECT_NAME 3 NULL YES varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select,insert,update,references @@ -520,8 +550,16 @@ def performance_schema performance_timers TIMER_RESOLUTION 3 NULL YES bigint NUL def performance_schema performance_timers TIMER_OVERHEAD 4 NULL YES bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references def performance_schema rwlock_instances NAME 1 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references def performance_schema rwlock_instances OBJECT_INSTANCE_BEGIN 2 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema rwlock_instances WRITE_LOCKED_BY_THREAD_ID 3 NULL YES int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema rwlock_instances WRITE_LOCKED_BY_THREAD_ID 3 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema rwlock_instances READ_LOCKED_BY_COUNT 4 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references +def performance_schema session_account_connect_attrs PROCESSLIST_ID 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema session_account_connect_attrs ATTR_NAME 2 NULL NO varchar 32 96 NULL NULL NULL utf8 utf8_bin varchar(32) select,insert,update,references +def performance_schema session_account_connect_attrs ATTR_VALUE 3 NULL YES varchar 1024 3072 NULL NULL NULL utf8 utf8_bin varchar(1024) select,insert,update,references +def performance_schema session_account_connect_attrs ORDINAL_POSITION 4 NULL YES int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema session_connect_attrs PROCESSLIST_ID 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema session_connect_attrs ATTR_NAME 2 NULL NO varchar 32 96 NULL NULL NULL utf8 utf8_bin varchar(32) select,insert,update,references +def performance_schema session_connect_attrs ATTR_VALUE 3 NULL YES varchar 1024 3072 NULL NULL NULL utf8 utf8_bin varchar(1024) select,insert,update,references +def performance_schema session_connect_attrs ORDINAL_POSITION 4 NULL YES int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references def performance_schema setup_actors HOST 1 % NO char 60 180 NULL NULL NULL utf8 utf8_bin char(60) select,insert,update,references def performance_schema setup_actors USER 2 % NO char 16 48 NULL NULL NULL utf8 utf8_bin char(16) select,insert,update,references def performance_schema setup_actors ROLE 3 % NO char 16 48 NULL NULL NULL utf8 utf8_bin char(16) select,insert,update,references @@ -539,7 +577,7 @@ def performance_schema setup_timers NAME 1 NULL NO varchar 64 192 NULL NULL NULL def performance_schema setup_timers TIMER_NAME 2 NULL NO enum 11 33 NULL NULL NULL utf8 utf8_general_ci enum('CYCLE','NANOSECOND','MICROSECOND','MILLISECOND','TICK') select,insert,update,references def performance_schema socket_instances EVENT_NAME 1 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references def performance_schema socket_instances OBJECT_INSTANCE_BEGIN 2 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema socket_instances THREAD_ID 3 NULL YES int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema socket_instances THREAD_ID 3 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema socket_instances SOCKET_ID 4 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references def performance_schema socket_instances IP 5 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select,insert,update,references def performance_schema socket_instances PORT 6 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references @@ -741,10 +779,10 @@ def performance_schema table_lock_waits_summary_by_table SUM_TIMER_WRITE_EXTERNA def performance_schema table_lock_waits_summary_by_table MIN_TIMER_WRITE_EXTERNAL 71 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema table_lock_waits_summary_by_table AVG_TIMER_WRITE_EXTERNAL 72 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema table_lock_waits_summary_by_table MAX_TIMER_WRITE_EXTERNAL 73 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references -def performance_schema threads THREAD_ID 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema threads THREAD_ID 1 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema threads NAME 2 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references def performance_schema threads TYPE 3 NULL NO varchar 10 30 NULL NULL NULL utf8 utf8_general_ci varchar(10) select,insert,update,references -def performance_schema threads PROCESSLIST_ID 4 NULL YES int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema threads PROCESSLIST_ID 4 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema threads PROCESSLIST_USER 5 NULL YES varchar 16 48 NULL NULL NULL utf8 utf8_general_ci varchar(16) select,insert,update,references def performance_schema threads PROCESSLIST_HOST 6 NULL YES varchar 60 180 NULL NULL NULL utf8 utf8_general_ci varchar(60) select,insert,update,references def performance_schema threads PROCESSLIST_DB 7 NULL YES varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select,insert,update,references @@ -752,7 +790,7 @@ def performance_schema threads PROCESSLIST_COMMAND 8 NULL YES varchar 16 48 NULL def performance_schema threads PROCESSLIST_TIME 9 NULL YES bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references def performance_schema threads PROCESSLIST_STATE 10 NULL YES varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select,insert,update,references def performance_schema threads PROCESSLIST_INFO 11 NULL YES longtext 4294967295 4294967295 NULL NULL NULL utf8 utf8_general_ci longtext select,insert,update,references -def performance_schema threads PARENT_THREAD_ID 12 NULL YES int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references +def performance_schema threads PARENT_THREAD_ID 12 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema threads ROLE 13 NULL YES varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select,insert,update,references def performance_schema threads INSTRUMENTED 14 NULL NO enum 3 9 NULL NULL NULL utf8 utf8_general_ci enum('YES','NO') select,insert,update,references def performance_schema users USER 1 NULL YES char 16 48 NULL NULL NULL utf8 utf8_bin char(16) select,insert,update,references diff --git a/mysql-test/suite/perfschema/r/trigger_table_io.result b/mysql-test/suite/perfschema/r/trigger_table_io.result index a8207a8b32a..e77e7d864f1 100644 --- a/mysql-test/suite/perfschema/r/trigger_table_io.result +++ b/mysql-test/suite/perfschema/r/trigger_table_io.result @@ -184,6 +184,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/r/view_table_io.result b/mysql-test/suite/perfschema/r/view_table_io.result index 1d05ad38f56..5f17b5ae9e1 100644 --- a/mysql-test/suite/perfschema/r/view_table_io.result +++ b/mysql-test/suite/perfschema/r/view_table_io.result @@ -135,6 +135,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_session_connect_attrs_lost 0 Performance_schema_socket_classes_lost 0 Performance_schema_socket_instances_lost 0 Performance_schema_stage_classes_lost 0 diff --git a/mysql-test/suite/perfschema/t/digest_table_full.test b/mysql-test/suite/perfschema/t/digest_table_full.test index b0ff0ab6f21..cb9d7ea4ea8 100644 --- a/mysql-test/suite/perfschema/t/digest_table_full.test +++ b/mysql-test/suite/perfschema/t/digest_table_full.test @@ -19,7 +19,7 @@ TRUNCATE TABLE performance_schema.events_statements_summary_by_digest; --echo #################################### --echo # QUERYING PS STATEMENT DIGEST --echo #################################### -SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, +SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; diff --git a/mysql-test/suite/perfschema/t/disabled.def b/mysql-test/suite/perfschema/t/disabled.def index 888298bbb09..79b31af3066 100644 --- a/mysql-test/suite/perfschema/t/disabled.def +++ b/mysql-test/suite/perfschema/t/disabled.def @@ -9,3 +9,5 @@ # Do not use any TAB characters for whitespace. # ############################################################################## +hostcache_ipv4_max_con : BUG#14627287 27th Sept, 2012 Mayank +hostcache_ipv6_max_con : BUG#14627287 27th Sept, 2012 Mayank diff --git a/mysql-test/suite/perfschema/t/dml_setup_instruments.test b/mysql-test/suite/perfschema/t/dml_setup_instruments.test index 5582d559664..8a4f11ba51f 100644 --- a/mysql-test/suite/perfschema/t/dml_setup_instruments.test +++ b/mysql-test/suite/perfschema/t/dml_setup_instruments.test @@ -82,3 +82,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.setup_instruments WRITE; UNLOCK TABLES; +--echo +--echo # Bug#13813193 ASSERTION `TABLE->READ_SET == +--echo # &TABLE->DEF_READ_SET' FAILED / MYSQL_UPDATE +--echo +UPDATE performance_schema.setup_instruments SET timed='NO' +ORDER BY RAND(); 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 d66351abfe9..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 @@ -14,9 +14,9 @@ # Temporary failure in name resolution call mtr.add_suppression("santa.claus.ipv4.example.com"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc grant select on test.* to 'root'@'192.0.2.4'; 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 2e9fe463638..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 @@ -14,9 +14,9 @@ # Temporary failure in name resolution call mtr.add_suppression("santa.claus.ipv4.example.com"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con1 is alive"; 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 67df450b947..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 @@ -16,9 +16,9 @@ # [Note] - 192.0.2.127 call mtr.add_suppression("santa.claus.ipv4.example.com"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc grant select on test.* to 'root'@'192.0.2.4'; 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 eb0a366c07f..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 @@ -16,9 +16,9 @@ # [Note] - 192.0.2.127 call mtr.add_suppression("santa.claus.ipv4.example.com"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con1 is alive"; 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 8aed2681a68..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 @@ -14,9 +14,9 @@ # no reverse address mapping. call mtr.add_suppression("192.0.2.4"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc grant select on test.* to 'root'@'santa.claus.ipv4.example.com'; 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 b8779cc7902..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 @@ -14,9 +14,9 @@ # no reverse address mapping. call mtr.add_suppression("192.0.2.4"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con1 is alive"; 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 11c2d521e54..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 @@ -14,9 +14,9 @@ # Name or service not known call mtr.add_suppression("santa.claus.ipv4.example.com"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc grant select on test.* to 'root'@'santa.claus.ipv4.example.com'; grant select on test.* to 'root'@'192.0.2.4'; 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 1505288c8aa..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 @@ -14,9 +14,9 @@ # Name or service not known call mtr.add_suppression("santa.claus.ipv4.example.com"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con1 is alive"; 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 f14edcffbb3..e4903f0aa33 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test @@ -13,9 +13,9 @@ --source include/have_perfschema.inc --source include/have_plugin_auth.inc -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc CREATE USER 'plug'@'santa.claus.ipv4.example.com' IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest'; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test index 31c93f9ca1c..0917fbf2aa8 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test @@ -12,11 +12,10 @@ --source include/have_debug.inc --source include/have_perfschema.inc -flush status; -flush hosts; -flush user_resources; -select @@global.debug; -select @@global.max_connect_errors; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc + select @@global.max_connect_errors into @saved_max_connect_errors; set global max_connect_errors = 2; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test index de85c0ec3f5..4766dbef778 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test @@ -13,9 +13,9 @@ # Name or service not known call mtr.add_suppression("192.0.2.4"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con1 is alive"; 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 a6c0e8ffeb7..3bf5ef3b68d 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test @@ -14,15 +14,10 @@ # Enforce a clean state --source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc -flush status; -flush hosts; -flush user_resources; -select @@global.debug; -select @@global.max_user_connections; -select @@global.max_user_connections into @saved_max_user_connections; -select @@global.max_connections; 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'; 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 d333b46a8ad..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 @@ -14,9 +14,9 @@ # Temporary failure in name resolution call mtr.add_suppression("192.0.2.4"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc grant select on test.* to 'root'@'192.0.2.4'; grant select on test.* to 'root'@'santa.claus.ipv4.example.com'; 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 e56a49789a0..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 @@ -14,9 +14,9 @@ # Temporary failure in name resolution call mtr.add_suppression("192.0.2.4"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con1 is alive"; 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 42d25467be5..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 @@ -14,9 +14,9 @@ # no reverse address mapping. call mtr.add_suppression("192.0.2.4"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc grant select on test.* to 'root'@'192.0.2.4'; 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 d8cc7a4b58b..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 @@ -14,9 +14,9 @@ # no reverse address mapping. call mtr.add_suppression("192.0.2.4"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con1 is alive"; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test index 1f9db150134..b39f3478146 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test @@ -12,10 +12,9 @@ # Enforce a clean state --source ../include/wait_for_pfs_thread_count.inc -flush status; -flush hosts; -flush user_resources; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc create user 'user_without'@'santa.claus.ipv4.example.com'; create user 'user_with'@'santa.claus.ipv4.example.com' diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test index ffc029e451a..de58219d490 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test @@ -11,11 +11,7 @@ # Enforce a clean state --source ../include/wait_for_pfs_thread_count.inc - -flush status; -flush hosts; -flush user_resources; -select @@global.debug; +--source ../include/hostcache_set_state.inc create user 'user_ssl'@'santa.claus.ipv4.example.com'; create user 'user_ssl_x509'@'santa.claus.ipv4.example.com' 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 68314d20f47..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 @@ -15,9 +15,9 @@ # Temporary failure in name resolution call mtr.add_suppression("santa.claus.ipv6.example.com"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc grant select on test.* to 'root'@'2001:db8::6:6'; 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 8764f2f7c5e..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 @@ -15,9 +15,9 @@ # Temporary failure in name resolution call mtr.add_suppression("santa.claus.ipv6.example.com"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc connect (con1,"::1",root,,test,$MASTER_MYPORT,); select "Con1 is alive"; 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 f62929050d4..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 @@ -17,9 +17,9 @@ # [Note] - 2001:db8::6:7f call mtr.add_suppression("santa.claus.ipv6.example.com"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc grant select on test.* to 'root'@'2001:db8::6:6'; 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 d8e5e4a958a..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 @@ -17,10 +17,9 @@ # [Note] - 2001:db8::6:7f call mtr.add_suppression("santa.claus.ipv6.example.com"); - -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc connect (con1,"::1",root,,test,$MASTER_MYPORT,); select "Con1 is alive"; 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 c21f6073174..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 @@ -15,9 +15,9 @@ # no reverse address mapping. call mtr.add_suppression("192.0.2.4"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc grant select on test.* to 'root'@'santa.claus.ipv6.example.com'; 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 cc60c08ac93..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 @@ -11,9 +11,9 @@ --source include/have_ipv6.inc --source include/have_perfschema.inc -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc connect (con1,"::1",root,,test,$MASTER_MYPORT,); select "Con1 is alive"; 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 d66dd14c65f..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 @@ -15,9 +15,9 @@ # Name or service not known call mtr.add_suppression("santa.claus.ipv6.example.com"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc grant select on test.* to 'root'@'santa.claus.ipv6.example.com'; grant select on test.* to 'root'@'2001:db8::6:6'; 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 c743b7639d7..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 @@ -15,9 +15,9 @@ # Name or service not known call mtr.add_suppression("santa.claus.ipv6.example.com"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc connect (con1,"::1",root,,test,$MASTER_MYPORT,); select "Con1 is alive"; 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 9c3b4cdaec3..1d5c7c546e9 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test @@ -14,9 +14,9 @@ --source include/have_perfschema.inc --source include/have_plugin_auth.inc -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc CREATE USER 'plug'@'santa.claus.ipv6.example.com' IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest'; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test index f4628df7ca6..9ed365bf3c8 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test @@ -13,11 +13,10 @@ --source include/have_ipv6.inc --source include/have_perfschema.inc -flush status; -flush hosts; -flush user_resources; -select @@global.debug; -select @@global.max_connect_errors; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc + select @@global.max_connect_errors into @saved_max_connect_errors; set global max_connect_errors = 2; 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 12ea1c28bfc..d4adc3e0d00 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test @@ -15,15 +15,10 @@ # Enforce a clean state --source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc -flush status; -flush hosts; -flush user_resources; -select @@global.debug; -select @@global.max_user_connections; -select @@global.max_user_connections into @saved_max_user_connections; -select @@global.max_connections; 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'; 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 fabd16be291..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 @@ -15,9 +15,9 @@ # Temporary failure in name resolution call mtr.add_suppression("2001:db8::6:6"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc grant select on test.* to 'root'@'2001:db8::6:6'; grant select on test.* to 'root'@'santa.claus.ipv6.example.com'; 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 c8e40862360..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 @@ -15,9 +15,9 @@ # Temporary failure in name resolution call mtr.add_suppression("2001:db8::6:6"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc connect (con1,"::1",root,,test,$MASTER_MYPORT,); select "Con1 is alive"; 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 29fbd6aad4e..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 @@ -15,9 +15,9 @@ # Name or service not known call mtr.add_suppression("2001:db8::6:6"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc grant select on test.* to 'root'@'2001:db8::6:6'; 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 218409f8f87..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 @@ -15,9 +15,9 @@ # Name or service not known call mtr.add_suppression("2001:db8::6:6"); -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc connect (con1,"::1",root,,test,$MASTER_MYPORT,); select "Con1 is alive"; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test index 9acb35ef616..6dd33b9bb5b 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test @@ -12,11 +12,7 @@ # Enforce a clean state --source ../include/wait_for_pfs_thread_count.inc - -flush status; -flush hosts; -flush user_resources; -select @@global.debug; +--source ../include/hostcache_set_state.inc create user 'user_without'@'santa.claus.ipv6.example.com'; create user 'user_with'@'santa.claus.ipv6.example.com' diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test index b7d119a0b07..2b30a4eaf41 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test @@ -12,11 +12,7 @@ # Enforce a clean state --source ../include/wait_for_pfs_thread_count.inc - -flush status; -flush hosts; -flush user_resources; -select @@global.debug; +--source ../include/hostcache_set_state.inc create user 'user_ssl'@'santa.claus.ipv6.example.com'; create user 'user_ssl_x509'@'santa.claus.ipv6.example.com' diff --git a/mysql-test/suite/perfschema/t/hostcache_peer_addr.test b/mysql-test/suite/perfschema/t/hostcache_peer_addr.test index 043139479a5..9e5c88b8bd5 100644 --- a/mysql-test/suite/perfschema/t/hostcache_peer_addr.test +++ b/mysql-test/suite/perfschema/t/hostcache_peer_addr.test @@ -9,9 +9,10 @@ --source include/have_debug.inc --source include/have_perfschema.inc -flush status; -flush hosts; -select @@global.debug; +# Enforce a clean state +--source ../include/wait_for_pfs_thread_count.inc +--source ../include/hostcache_set_state.inc + show global status like "connection_errors_%"; connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,); diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade.test b/mysql-test/suite/perfschema/t/pfs_upgrade.test deleted file mode 100644 index b4a19a66c3b..00000000000 --- a/mysql-test/suite/perfschema/t/pfs_upgrade.test +++ /dev/null @@ -1,10 +0,0 @@ -# Tests for PERFORMANCE_SCHEMA -# Make sure mysql_upgrade does not destroy data in a 'performance_schema' -# database. -# - ---source include/not_embedded.inc ---source include/have_perfschema.inc ---source include/have_innodb.inc ---source ../include/pfs_upgrade.inc - diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_event.test b/mysql-test/suite/perfschema/t/pfs_upgrade_event.test new file mode 100644 index 00000000000..db7613052d4 --- /dev/null +++ b/mysql-test/suite/perfschema/t/pfs_upgrade_event.test @@ -0,0 +1,36 @@ +# Tests for PERFORMANCE_SCHEMA +# Make sure mysql_upgrade does not destroy data in a 'performance_schema' +# database. +# + +--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`; +let $err_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_event.err; +let $out_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_event.out; +--error 0,1 +--remove_file $out_file +--error 0,1 +--remove_file $err_file + +--disable_warnings +drop event if exists test.user_event; +--enable_warnings + +--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/t/pfs_upgrade_func.test b/mysql-test/suite/perfschema/t/pfs_upgrade_func.test new file mode 100644 index 00000000000..4f53aa1bdd1 --- /dev/null +++ b/mysql-test/suite/perfschema/t/pfs_upgrade_func.test @@ -0,0 +1,36 @@ +# Tests for PERFORMANCE_SCHEMA +# Make sure mysql_upgrade does not destroy data in a 'performance_schema' +# database. +# + +--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`; +let $err_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_func.err; +let $out_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_func.out; +--error 0,1 +--remove_file $out_file +--error 0,1 +--remove_file $err_file + +--disable_warnings +drop function if exists test.user_func; +--enable_warnings + +--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; + diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_proc.test b/mysql-test/suite/perfschema/t/pfs_upgrade_proc.test new file mode 100644 index 00000000000..432cee6fb1a --- /dev/null +++ b/mysql-test/suite/perfschema/t/pfs_upgrade_proc.test @@ -0,0 +1,36 @@ +# Tests for PERFORMANCE_SCHEMA +# Make sure mysql_upgrade does not destroy data in a 'performance_schema' +# database. +# + +--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`; +let $err_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_proc.err; +let $out_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_proc.out; +--error 0,1 +--remove_file $out_file +--error 0,1 +--remove_file $err_file + +--disable_warnings +drop procedure if exists test.user_proc; +--enable_warnings + +--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; + diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_table.test b/mysql-test/suite/perfschema/t/pfs_upgrade_table.test new file mode 100644 index 00000000000..c68e156a2db --- /dev/null +++ b/mysql-test/suite/perfschema/t/pfs_upgrade_table.test @@ -0,0 +1,44 @@ +# Tests for PERFORMANCE_SCHEMA +# Make sure mysql_upgrade does not destroy data in a 'performance_schema' +# database. +# + +--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`; +let $err_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_table.err; +let $out_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_table.out; +--error 0,1 +--remove_file $out_file +--error 0,1 +--remove_file $err_file + +--disable_warnings +drop table if exists test.user_table; +--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; + diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_view.test b/mysql-test/suite/perfschema/t/pfs_upgrade_view.test new file mode 100644 index 00000000000..38ce377f235 --- /dev/null +++ b/mysql-test/suite/perfschema/t/pfs_upgrade_view.test @@ -0,0 +1,44 @@ +# Tests for PERFORMANCE_SCHEMA +# Make sure mysql_upgrade does not destroy data in a 'performance_schema' +# database. +# + +--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`; +let $err_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_view.err; +let $out_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_view.out; +--error 0,1 +--remove_file $out_file +--error 0,1 +--remove_file $err_file + +--disable_warnings +drop view if exists test.user_view; +--enable_warnings + +--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; + diff --git a/mysql-test/suite/perfschema/t/privilege_table_io.test b/mysql-test/suite/perfschema/t/privilege_table_io.test index aee8221dfc5..dc17fbcf67e 100644 --- a/mysql-test/suite/perfschema/t/privilege_table_io.test +++ b/mysql-test/suite/perfschema/t/privilege_table_io.test @@ -14,7 +14,13 @@ # Therefore we suppress the query_log here. --echo # We are forced to suppress here the server response. --disable_result_log +optimize table mysql.host; +optimize table mysql.user; optimize table mysql.db; +optimize table mysql.proxies_priv; +optimize table mysql.tables_priv; +optimize table mysql.procs_priv; +optimize table mysql.servers; --enable_result_log # Start recording events diff --git a/mysql-test/suite/perfschema/t/short_option_1.test b/mysql-test/suite/perfschema/t/short_option_1.test index 3877e7b7277..b94d1685867 100644 --- a/mysql-test/suite/perfschema/t/short_option_1.test +++ b/mysql-test/suite/perfschema/t/short_option_1.test @@ -14,4 +14,6 @@ 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/start_server_no_digests.test b/mysql-test/suite/perfschema/t/start_server_no_digests.test index b0ff0ab6f21..cb9d7ea4ea8 100644 --- a/mysql-test/suite/perfschema/t/start_server_no_digests.test +++ b/mysql-test/suite/perfschema/t/start_server_no_digests.test @@ -19,7 +19,7 @@ TRUNCATE TABLE performance_schema.events_statements_summary_by_digest; --echo #################################### --echo # QUERYING PS STATEMENT DIGEST --echo #################################### -SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, +SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; diff --git a/mysql-test/suite/perfschema/t/start_server_nothing-master.opt b/mysql-test/suite/perfschema/t/start_server_nothing-master.opt index 0203918849b..d0cd757cac1 100644 --- a/mysql-test/suite/perfschema/t/start_server_nothing-master.opt +++ b/mysql-test/suite/perfschema/t/start_server_nothing-master.opt @@ -35,3 +35,5 @@ --loose-performance_schema_events_statements_history_long_size=0 --loose-performance_schema_events_statements_history_size=0 +--loose-performance_schema_session_connect_attrs=0 + diff --git a/mysql-test/suite/perfschema/t/start_server_nothing.test b/mysql-test/suite/perfschema/t/start_server_nothing.test index 61f70dcfdb5..c337ef604f6 100644 --- a/mysql-test/suite/perfschema/t/start_server_nothing.test +++ b/mysql-test/suite/perfschema/t/start_server_nothing.test @@ -11,7 +11,7 @@ show variables like "performance_schema%"; select * from performance_schema.setup_instruments; select TIMER_NAME from performance_schema.performance_timers; select * from performance_schema.setup_consumers; -select * from performance_schema.setup_timers; +select NAME from performance_schema.setup_timers; # All empty select * from performance_schema.accounts; @@ -44,6 +44,8 @@ select * from performance_schema.events_waits_summary_global_by_event_name; select * from performance_schema.file_instances; select * from performance_schema.file_summary_by_event_name; select * from performance_schema.file_summary_by_instance; +select * from performance_schema.session_account_connect_attrs; +select * from performance_schema.session_connect_attrs; select * from performance_schema.socket_instances; select * from performance_schema.socket_summary_by_instance; select * from performance_schema.socket_summary_by_event_name; diff --git a/mysql-test/suite/perfschema/t/start_server_off.test b/mysql-test/suite/perfschema/t/start_server_off.test index a46c2898865..8b58f8c0814 100644 --- a/mysql-test/suite/perfschema/t/start_server_off.test +++ b/mysql-test/suite/perfschema/t/start_server_off.test @@ -19,3 +19,30 @@ select * from performance_schema.setup_instruments; select * from performance_schema.setup_actors; select * from performance_schema.setup_objects; select * from performance_schema.setup_timers; + +# Expect INSERT to fail with an error + +--error ER_WRONG_PERFSCHEMA_USAGE +insert into performance_schema.setup_objects values ('TABLE', 'myschema', 'myobject', 'YES', 'YES'); + +--error ER_WRONG_PERFSCHEMA_USAGE +insert into performance_schema.setup_actors values ('myhost', 'mysuser', 'myrole'); + +# Expect SELECT, UPDATE, DELETE and TRUNCATE to affect 0 rows, but with +# no error because the target row(s) will not be found + +select * from performance_schema.setup_objects; +update performance_schema.setup_objects set OBJECT_NAME = 'myobject'; +delete from performance_schema.setup_objects; + +select * from performance_schema.setup_actors; +update performance_schema.setup_actors set HOST = 'myhost'; +delete from performance_schema.setup_actors; + +truncate performance_schema.events_stages_history_long; +truncate performance_schema.events_statements_history_long; +truncate performance_schema.events_waits_history_long; +truncate performance_schema.setup_objects; +truncate performance_schema.setup_actors; + + diff --git a/mysql-test/suite/perfschema/t/statement_digest.test b/mysql-test/suite/perfschema/t/statement_digest.test index 24c43cdbac4..ed1f99e4318 100644 --- a/mysql-test/suite/perfschema/t/statement_digest.test +++ b/mysql-test/suite/perfschema/t/statement_digest.test @@ -16,7 +16,7 @@ TRUNCATE TABLE performance_schema.events_statements_summary_by_digest; --echo #################################### --echo # QUERYING PS STATEMENT DIGEST --echo #################################### -SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, +SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; # Cleanup for Digest diff --git a/mysql-test/suite/perfschema/t/statement_digest_consumers.test b/mysql-test/suite/perfschema/t/statement_digest_consumers.test index e7721d770ea..e7510e32049 100644 --- a/mysql-test/suite/perfschema/t/statement_digest_consumers.test +++ b/mysql-test/suite/perfschema/t/statement_digest_consumers.test @@ -28,7 +28,7 @@ TRUNCATE TABLE performance_schema.events_statements_summary_by_digest; --echo #################################### --echo # QUERYING PS STATEMENT DIGEST --echo #################################### -SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest; +SELECT schema_name, digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest; SELECT digest, digest_text FROM performance_schema.events_statements_current; # Cleanup for Digest diff --git a/mysql-test/suite/perfschema/t/statement_digest_consumers2.test b/mysql-test/suite/perfschema/t/statement_digest_consumers2.test index 72bf5241ee8..98442349927 100644 --- a/mysql-test/suite/perfschema/t/statement_digest_consumers2.test +++ b/mysql-test/suite/perfschema/t/statement_digest_consumers2.test @@ -30,7 +30,7 @@ TRUNCATE TABLE performance_schema.events_statements_summary_by_digest; --echo #################################### --echo # QUERYING PS STATEMENT DIGEST --echo #################################### -SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest; +SELECT schema_name, digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest; SELECT digest, digest_text FROM performance_schema.events_statements_current; # Cleanup for Digest diff --git a/mysql-test/suite/perfschema/t/statement_digest_long_query.test b/mysql-test/suite/perfschema/t/statement_digest_long_query.test index fdc9496c4f1..3969383a6fb 100644 --- a/mysql-test/suite/perfschema/t/statement_digest_long_query.test +++ b/mysql-test/suite/perfschema/t/statement_digest_long_query.test @@ -20,4 +20,4 @@ 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 --echo #################################### --echo # QUERYING PS STATEMENT DIGEST --echo #################################### -SELECT digest, digest_text, count_star FROM events_statements_summary_by_digest; +SELECT schema_name, digest, digest_text, count_star FROM events_statements_summary_by_digest; diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 896da2d3b0e..b160c68f7c2 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -298,7 +298,7 @@ static void check_unused(THD *thd) } /* extra() may assume that in_use is set */ entry->in_use= thd; - DBUG_ASSERT(! entry->file->extra(HA_EXTRA_IS_ATTACHED_CHILDREN)); + DBUG_ASSERT(!thd || ! entry->file->extra(HA_EXTRA_IS_ATTACHED_CHILDREN)); entry->in_use= 0; count--; |