diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-09-27 20:09:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-09-27 20:09:46 +0200 |
| commit | 474fe6d9d9e0b4d8803bdf439dd017ba0c729729 (patch) | |
| tree | 6b088655217934bf0cbb6cdf85df0a217ef1d939 /mysql-test/suite/perfschema/r | |
| parent | cd9f773020c6ddfc1ea39e9037e4258b8bc32a08 (diff) | |
| download | mariadb-git-474fe6d9d9e0b4d8803bdf439dd017ba0c729729.tar.gz | |
fixes for test failures
and small collateral changes
mysql-test/lib/My/Test.pm:
somehow with "print" we get truncated writes sometimes
mysql-test/suite/perfschema/r/digest_table_full.result:
md5 hashes of statement digests differ, because yacc token codes are different in mariadb
mysql-test/suite/perfschema/r/dml_handler.result:
host table is not ported over yet
mysql-test/suite/perfschema/r/information_schema.result:
host table is not ported over yet
mysql-test/suite/perfschema/r/nesting.result:
this differs, because we don't rewrite general log queries, and multi-statement
packets are logged as a one entry. this result file is identical to what mysql-5.6.5
produces with the --log-raw option.
mysql-test/suite/perfschema/r/relaylog.result:
MariaDB modifies the binlog index file directly, while MySQL 5.6 has a feature "crash-safe binlog index" and modifies a special "crash-safe" shadow copy of the index file and then moves it over. That's why this test shows "NONE" index file writes in MySQL and "MANY" in MariaDB.
mysql-test/suite/perfschema/r/server_init.result:
MariaDB initializes the "manager" resources from the "manager" thread, and starts this thread only when --flush-time is not 0. MySQL 5.6 initializes "manager" resources unconditionally on server startup.
mysql-test/suite/perfschema/r/stage_mdl_global.result:
this differs, because MariaDB disables query cache when query_cache_size=0. MySQL does not
do that, and this causes useless mutex locks and waits.
mysql-test/suite/perfschema/r/statement_digest.result:
md5 hashes of statement digests differ, because yacc token codes are different in mariadb
mysql-test/suite/perfschema/r/statement_digest_consumers.result:
md5 hashes of statement digests differ, because yacc token codes are different in mariadb
mysql-test/suite/perfschema/r/statement_digest_long_query.result:
md5 hashes of statement digests differ, because yacc token codes are different in mariadb
mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result:
will be updated to match 5.6 when alfranio.correia@oracle.com-20110512172919-c1b5kmum4h52g0ni and anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y are merged
mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result:
will be updated to match 5.6 when anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y is merged
Diffstat (limited to 'mysql-test/suite/perfschema/r')
94 files changed, 474 insertions, 579 deletions
diff --git a/mysql-test/suite/perfschema/r/binlog_mix.result b/mysql-test/suite/perfschema/r/binlog_mix.result index 1c639340b3b..44e907daf04 100644 --- a/mysql-test/suite/perfschema/r/binlog_mix.result +++ b/mysql-test/suite/perfschema/r/binlog_mix.result @@ -26,10 +26,6 @@ update performance_schema.setup_instruments set enabled='YES' and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query # # BEGIN -master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments) -master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t2` /* generated by server */ master-bin.000001 # Query # # use `test`; create table test.t1 (thread_id integer) @@ -44,7 +40,3 @@ master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ -master-bin.000001 # Query # # BEGIN -master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments) -master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # COMMIT diff --git a/mysql-test/suite/perfschema/r/binlog_row.result b/mysql-test/suite/perfschema/r/binlog_row.result index 6ef080663c7..e7a0c2a04b9 100644 --- a/mysql-test/suite/perfschema/r/binlog_row.result +++ b/mysql-test/suite/perfschema/r/binlog_row.result @@ -26,10 +26,6 @@ update performance_schema.setup_instruments set enabled='YES' and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query # # BEGIN -master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments) -master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t2` /* generated by server */ master-bin.000001 # Query # # use `test`; create table test.t1 (thread_id integer) @@ -44,7 +40,3 @@ master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ -master-bin.000001 # Query # # BEGIN -master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments) -master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # COMMIT diff --git a/mysql-test/suite/perfschema/r/binlog_stmt.result b/mysql-test/suite/perfschema/r/binlog_stmt.result index 80c646abe46..c3420296794 100644 --- a/mysql-test/suite/perfschema/r/binlog_stmt.result +++ b/mysql-test/suite/perfschema/r/binlog_stmt.result @@ -20,12 +20,14 @@ insert into test.t1 select thread_id from performance_schema.events_waits_current; Warnings: Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves. +Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Mixing self-logging and non-self-logging engines in a statement is unsafe. insert into test.t2 select name from performance_schema.setup_instruments where name like "wait/synch/rwlock/sql/%" and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); Warnings: Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves. +Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Mixing self-logging and non-self-logging engines in a statement is unsafe. drop table test.t1; drop table test.t2; update performance_schema.setup_instruments set enabled='YES' diff --git a/mysql-test/suite/perfschema/r/digest_table_full.result b/mysql-test/suite/perfschema/r/digest_table_full.result index 2ae455f3d3a..218592c7644 100644 --- a/mysql-test/suite/perfschema/r/digest_table_full.result +++ b/mysql-test/suite/perfschema/r/digest_table_full.result @@ -76,7 +76,7 @@ SELECT 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 -dee8f4f04e57a5e456c31892855e6835 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 +d238cb191361f39845a6adb2961f5501 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 SHOW VARIABLES LIKE "performance_schema_digests_size"; Variable_name Value performance_schema_digests_size 2 diff --git a/mysql-test/suite/perfschema/r/dml_handler.result b/mysql-test/suite/perfschema/r/dml_handler.result index de3071c7535..707a1d7071a 100644 --- a/mysql-test/suite/perfschema/r/dml_handler.result +++ b/mysql-test/suite/perfschema/r/dml_handler.result @@ -9,63 +9,60 @@ 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=50; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=49; 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=49; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=48; 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=48; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=47; 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=47; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=46; 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=46; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=45; 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=45; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=44; 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=44; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=43; 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=43; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=42; 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=42; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=41; 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=41; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=40; 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=40; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=39; 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=39; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=38; 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=38; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=37; 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=37; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=36; 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=36; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=35; 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=35; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=34; 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=34; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=33; 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=33; +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=32; 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 30c7ff5125b..27e8a274638 100644 --- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result +++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result @@ -11,9 +11,9 @@ wait/synch/mutex/sql/hash_filo::lock YES YES wait/synch/mutex/sql/HA_DATA_PARTITION::LOCK_auto_inc YES YES wait/synch/mutex/sql/LOCK_active_mi YES YES wait/synch/mutex/sql/LOCK_audit_mask YES YES +wait/synch/mutex/sql/LOCK_commit_ordered YES YES wait/synch/mutex/sql/LOCK_connection_count YES YES wait/synch/mutex/sql/LOCK_crypt YES YES -wait/synch/mutex/sql/LOCK_delayed_create YES YES select * from performance_schema.setup_instruments where name like 'Wait/Synch/Rwlock/sql/%' and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock') diff --git a/mysql-test/suite/perfschema/r/information_schema.result b/mysql-test/suite/perfschema/r/information_schema.result index e38c13213b7..8497f7ea40d 100644 --- a/mysql-test/suite/perfschema/r/information_schema.result +++ b/mysql-test/suite/perfschema/r/information_schema.result @@ -33,7 +33,6 @@ 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 @@ -87,7 +86,6 @@ 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 @@ -141,7 +139,6 @@ 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 @@ -195,7 +192,6 @@ 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 @@ -249,7 +245,6 @@ 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 @@ -303,7 +298,6 @@ 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 @@ -357,7 +351,6 @@ 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 @@ -411,7 +404,6 @@ 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 @@ -465,7 +457,6 @@ 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 diff --git a/mysql-test/suite/perfschema/r/misc.result b/mysql-test/suite/perfschema/r/misc.result index 2481367950b..913f98d9663 100644 --- a/mysql-test/suite/perfschema/r/misc.result +++ b/mysql-test/suite/perfschema/r/misc.result @@ -42,12 +42,12 @@ AND EVENT_NAME IN WHERE NAME LIKE "wait/synch/%") LIMIT 1; create table test.t1(a int) engine=performance_schema; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") SELECT object_schema, object_name FROM performance_schema.objects_summary_global_by_type WHERE object_schema='test'; object_schema object_name create table test.t1 like performance_schema.events_waits_current; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") SELECT object_schema, object_name FROM performance_schema.objects_summary_global_by_type WHERE object_schema='test'; object_schema object_name diff --git a/mysql-test/suite/perfschema/r/nesting.result b/mysql-test/suite/perfschema/r/nesting.result index 33bdbd7036c..0414b5d0fc1 100644 --- a/mysql-test/suite/perfschema/r/nesting.result +++ b/mysql-test/suite/perfschema/r/nesting.result @@ -181,53 +181,51 @@ select "With a third part to make things complete" as payload NULL NULL 70 70 stage/sql/closing tables (stage) STATEMENT 57 71 72 stage/sql/freeing items (stage) STATEMENT 57 72 72 wait/io/socket/sql/client_connection send STAGE 71 -73 86 statement/sql/select select "And this is the second part of a multi query" as payload; +73 85 statement/sql/select select "And this is the second part of a multi query" as payload; select "With a third part to make things complete" as payload NULL NULL -74 76 stage/sql/init (stage) STATEMENT 73 +74 75 stage/sql/init (stage) STATEMENT 73 75 75 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 74 -76 76 wait/io/file/sql/query_log write STAGE 74 -77 77 stage/sql/checking permissions (stage) STATEMENT 73 -78 78 stage/sql/Opening tables (stage) STATEMENT 73 -79 79 stage/sql/init (stage) STATEMENT 73 -80 80 stage/sql/optimizing (stage) STATEMENT 73 -81 81 stage/sql/executing (stage) STATEMENT 73 -82 82 stage/sql/end (stage) STATEMENT 73 -83 83 stage/sql/query end (stage) STATEMENT 73 -84 84 stage/sql/closing tables (stage) STATEMENT 73 -85 86 stage/sql/freeing items (stage) STATEMENT 73 -86 86 wait/io/socket/sql/client_connection send STAGE 85 -87 102 statement/sql/select select "With a third part to make things complete" as payload NULL NULL -88 90 stage/sql/init (stage) STATEMENT 87 -89 89 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 88 -90 90 wait/io/file/sql/query_log write STAGE 88 -91 91 stage/sql/checking permissions (stage) STATEMENT 87 -92 92 stage/sql/Opening tables (stage) STATEMENT 87 -93 93 stage/sql/init (stage) STATEMENT 87 -94 94 stage/sql/optimizing (stage) STATEMENT 87 -95 95 stage/sql/executing (stage) STATEMENT 87 -96 96 stage/sql/end (stage) STATEMENT 87 -97 97 stage/sql/query end (stage) STATEMENT 87 -98 98 stage/sql/closing tables (stage) STATEMENT 87 -99 100 stage/sql/freeing items (stage) STATEMENT 87 -100 100 wait/io/socket/sql/client_connection send STAGE 99 -101 102 stage/sql/cleaning up (stage) STATEMENT 87 -102 102 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 101 -103 103 idle idle NULL NULL -104 121 statement/sql/select select "MARKER_END" as marker NULL NULL -105 109 stage/sql/init (stage) STATEMENT 104 -106 106 wait/io/socket/sql/client_connection recv STAGE 105 -107 107 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 105 -108 108 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 105 -109 109 wait/io/file/sql/query_log write STAGE 105 -110 110 stage/sql/checking permissions (stage) STATEMENT 104 -111 111 stage/sql/Opening tables (stage) STATEMENT 104 -112 112 stage/sql/init (stage) STATEMENT 104 -113 113 stage/sql/optimizing (stage) STATEMENT 104 -114 114 stage/sql/executing (stage) STATEMENT 104 -115 115 stage/sql/end (stage) STATEMENT 104 -116 116 stage/sql/query end (stage) STATEMENT 104 -117 117 stage/sql/closing tables (stage) STATEMENT 104 -118 119 stage/sql/freeing items (stage) STATEMENT 104 -119 119 wait/io/socket/sql/client_connection send STAGE 118 -120 121 stage/sql/cleaning up (stage) STATEMENT 104 -121 121 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 120 +76 76 stage/sql/checking permissions (stage) STATEMENT 73 +77 77 stage/sql/Opening tables (stage) STATEMENT 73 +78 78 stage/sql/init (stage) STATEMENT 73 +79 79 stage/sql/optimizing (stage) STATEMENT 73 +80 80 stage/sql/executing (stage) STATEMENT 73 +81 81 stage/sql/end (stage) STATEMENT 73 +82 82 stage/sql/query end (stage) STATEMENT 73 +83 83 stage/sql/closing tables (stage) STATEMENT 73 +84 85 stage/sql/freeing items (stage) STATEMENT 73 +85 85 wait/io/socket/sql/client_connection send STAGE 84 +86 100 statement/sql/select select "With a third part to make things complete" as payload NULL NULL +87 88 stage/sql/init (stage) STATEMENT 86 +88 88 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 87 +89 89 stage/sql/checking permissions (stage) STATEMENT 86 +90 90 stage/sql/Opening tables (stage) STATEMENT 86 +91 91 stage/sql/init (stage) STATEMENT 86 +92 92 stage/sql/optimizing (stage) STATEMENT 86 +93 93 stage/sql/executing (stage) STATEMENT 86 +94 94 stage/sql/end (stage) STATEMENT 86 +95 95 stage/sql/query end (stage) STATEMENT 86 +96 96 stage/sql/closing tables (stage) STATEMENT 86 +97 98 stage/sql/freeing items (stage) STATEMENT 86 +98 98 wait/io/socket/sql/client_connection send STAGE 97 +99 100 stage/sql/cleaning up (stage) STATEMENT 86 +100 100 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 99 +101 101 idle idle NULL NULL +102 119 statement/sql/select select "MARKER_END" as marker NULL NULL +103 107 stage/sql/init (stage) STATEMENT 102 +104 104 wait/io/socket/sql/client_connection recv STAGE 103 +105 105 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 103 +106 106 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 103 +107 107 wait/io/file/sql/query_log write STAGE 103 +108 108 stage/sql/checking permissions (stage) STATEMENT 102 +109 109 stage/sql/Opening tables (stage) STATEMENT 102 +110 110 stage/sql/init (stage) STATEMENT 102 +111 111 stage/sql/optimizing (stage) STATEMENT 102 +112 112 stage/sql/executing (stage) STATEMENT 102 +113 113 stage/sql/end (stage) STATEMENT 102 +114 114 stage/sql/query end (stage) STATEMENT 102 +115 115 stage/sql/closing tables (stage) STATEMENT 102 +116 117 stage/sql/freeing items (stage) STATEMENT 102 +117 117 wait/io/socket/sql/client_connection send STAGE 116 +118 119 stage/sql/cleaning up (stage) STATEMENT 102 +119 119 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 118 diff --git a/mysql-test/suite/perfschema/r/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result index 72b1f35a8e6..d4ba3477c7c 100644 --- a/mysql-test/suite/perfschema/r/ortho_iter.result +++ b/mysql-test/suite/perfschema/r/ortho_iter.result @@ -115,7 +115,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade.result b/mysql-test/suite/perfschema/r/pfs_upgrade.result index eff1d0d48a0..2b8a685f61d 100644 --- a/mysql-test/suite/perfschema/r/pfs_upgrade.result +++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result @@ -8,59 +8,56 @@ use performance_schema; show tables like "user_table"; Tables_in_performance_schema (user_table) user_table -Warning: Using a password on the command line interface can be insecure. -Warning: Using a password on the command line interface can be insecure. -ERROR 1050 (42S01) at line 100: Table 'cond_instances' already exists -ERROR 1050 (42S01) at line 125: Table 'events_waits_current' already exists -ERROR 1050 (42S01) at line 150: Table 'events_waits_history' already exists -ERROR 1050 (42S01) at line 175: Table 'events_waits_history_long' already exists -ERROR 1050 (42S01) at line 188: Table 'events_waits_summary_by_instance' already exists -ERROR 1050 (42S01) at line 201: Table 'events_waits_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 214: Table 'events_waits_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 228: Table 'events_waits_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 241: Table 'events_waits_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 253: Table 'events_waits_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 262: Table 'file_instances' already exists -ERROR 1050 (42S01) at line 291: Table 'file_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 322: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists -ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists -ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists -ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 705: Table 'threads' already exists -ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 864: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 910: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 956: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 988: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 1020: Table 'events_statements_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 1085: Table 'events_statements_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 1125: Table 'hosts' already exists -ERROR 1050 (42S01) at line 1134: Table 'users' already exists -ERROR 1050 (42S01) at line 1144: Table 'accounts' already exists -ERROR 1050 (42S01) at line 1178: Table 'events_statements_summary_by_digest' already exists -ERROR 1644 (HY000) at line 1598: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line 122: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line 147: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line 172: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line 185: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line 198: Table 'events_waits_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 211: Table 'events_waits_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 225: Table 'events_waits_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 238: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 250: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 259: Table 'file_instances' already exists +ERROR 1050 (42S01) at line 288: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 319: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line 332: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 362: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 391: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 432: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 446: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 456: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 466: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 475: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 483: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 492: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 503: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 511: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 556: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 600: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 679: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 699: Table 'threads' already exists +ERROR 1050 (42S01) at line 715: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 731: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 747: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 760: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 773: Table 'events_stages_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 786: Table 'events_stages_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 800: Table 'events_stages_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 812: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 858: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 904: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists +ERROR 1050 (42S01) at line 1128: Table 'users' already exists +ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists +ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists +ERROR 1644 (HY000) at line 1591: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_table"; Tables_in_performance_schema (user_table) @@ -73,59 +70,56 @@ use performance_schema; show tables like "user_view"; Tables_in_performance_schema (user_view) user_view -Warning: Using a password on the command line interface can be insecure. -Warning: Using a password on the command line interface can be insecure. -ERROR 1050 (42S01) at line 100: Table 'cond_instances' already exists -ERROR 1050 (42S01) at line 125: Table 'events_waits_current' already exists -ERROR 1050 (42S01) at line 150: Table 'events_waits_history' already exists -ERROR 1050 (42S01) at line 175: Table 'events_waits_history_long' already exists -ERROR 1050 (42S01) at line 188: Table 'events_waits_summary_by_instance' already exists -ERROR 1050 (42S01) at line 201: Table 'events_waits_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 214: Table 'events_waits_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 228: Table 'events_waits_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 241: Table 'events_waits_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 253: Table 'events_waits_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 262: Table 'file_instances' already exists -ERROR 1050 (42S01) at line 291: Table 'file_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 322: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists -ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists -ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists -ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 705: Table 'threads' already exists -ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 864: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 910: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 956: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 988: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 1020: Table 'events_statements_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 1085: Table 'events_statements_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 1125: Table 'hosts' already exists -ERROR 1050 (42S01) at line 1134: Table 'users' already exists -ERROR 1050 (42S01) at line 1144: Table 'accounts' already exists -ERROR 1050 (42S01) at line 1178: Table 'events_statements_summary_by_digest' already exists -ERROR 1644 (HY000) at line 1598: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line 122: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line 147: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line 172: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line 185: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line 198: Table 'events_waits_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 211: Table 'events_waits_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 225: Table 'events_waits_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 238: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 250: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 259: Table 'file_instances' already exists +ERROR 1050 (42S01) at line 288: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 319: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line 332: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 362: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 391: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 432: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 446: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 456: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 466: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 475: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 483: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 492: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 503: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 511: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 556: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 600: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 679: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 699: Table 'threads' already exists +ERROR 1050 (42S01) at line 715: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 731: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 747: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 760: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 773: Table 'events_stages_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 786: Table 'events_stages_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 800: Table 'events_stages_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 812: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 858: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 904: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists +ERROR 1050 (42S01) at line 1128: Table 'users' already exists +ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists +ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists +ERROR 1644 (HY000) at line 1591: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_view"; Tables_in_performance_schema (user_view) @@ -136,59 +130,56 @@ drop view test.user_view; create procedure test.user_proc() select "Not supposed to be here"; update mysql.proc set db='performance_schema' where name='user_proc'; -Warning: Using a password on the command line interface can be insecure. -Warning: Using a password on the command line interface can be insecure. -ERROR 1050 (42S01) at line 100: Table 'cond_instances' already exists -ERROR 1050 (42S01) at line 125: Table 'events_waits_current' already exists -ERROR 1050 (42S01) at line 150: Table 'events_waits_history' already exists -ERROR 1050 (42S01) at line 175: Table 'events_waits_history_long' already exists -ERROR 1050 (42S01) at line 188: Table 'events_waits_summary_by_instance' already exists -ERROR 1050 (42S01) at line 201: Table 'events_waits_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 214: Table 'events_waits_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 228: Table 'events_waits_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 241: Table 'events_waits_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 253: Table 'events_waits_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 262: Table 'file_instances' already exists -ERROR 1050 (42S01) at line 291: Table 'file_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 322: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists -ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists -ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists -ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 705: Table 'threads' already exists -ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 864: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 910: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 956: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 988: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 1020: Table 'events_statements_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 1085: Table 'events_statements_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 1125: Table 'hosts' already exists -ERROR 1050 (42S01) at line 1134: Table 'users' already exists -ERROR 1050 (42S01) at line 1144: Table 'accounts' already exists -ERROR 1050 (42S01) at line 1178: Table 'events_statements_summary_by_digest' already exists -ERROR 1644 (HY000) at line 1598: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line 122: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line 147: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line 172: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line 185: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line 198: Table 'events_waits_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 211: Table 'events_waits_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 225: Table 'events_waits_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 238: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 250: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 259: Table 'file_instances' already exists +ERROR 1050 (42S01) at line 288: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 319: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line 332: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 362: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 391: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 432: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 446: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 456: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 466: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 475: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 483: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 492: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 503: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 511: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 556: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 600: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 679: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 699: Table 'threads' already exists +ERROR 1050 (42S01) at line 715: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 731: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 747: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 760: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 773: Table 'events_stages_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 786: Table 'events_stages_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 800: Table 'events_stages_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 812: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 858: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 904: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists +ERROR 1050 (42S01) at line 1128: Table 'users' already exists +ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists +ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists +ERROR 1644 (HY000) at line 1591: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -199,59 +190,56 @@ drop procedure test.user_proc; create function test.user_func() returns integer return 0; update mysql.proc set db='performance_schema' where name='user_func'; -Warning: Using a password on the command line interface can be insecure. -Warning: Using a password on the command line interface can be insecure. -ERROR 1050 (42S01) at line 100: Table 'cond_instances' already exists -ERROR 1050 (42S01) at line 125: Table 'events_waits_current' already exists -ERROR 1050 (42S01) at line 150: Table 'events_waits_history' already exists -ERROR 1050 (42S01) at line 175: Table 'events_waits_history_long' already exists -ERROR 1050 (42S01) at line 188: Table 'events_waits_summary_by_instance' already exists -ERROR 1050 (42S01) at line 201: Table 'events_waits_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 214: Table 'events_waits_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 228: Table 'events_waits_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 241: Table 'events_waits_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 253: Table 'events_waits_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 262: Table 'file_instances' already exists -ERROR 1050 (42S01) at line 291: Table 'file_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 322: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists -ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists -ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists -ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 705: Table 'threads' already exists -ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 864: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 910: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 956: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 988: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 1020: Table 'events_statements_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 1085: Table 'events_statements_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 1125: Table 'hosts' already exists -ERROR 1050 (42S01) at line 1134: Table 'users' already exists -ERROR 1050 (42S01) at line 1144: Table 'accounts' already exists -ERROR 1050 (42S01) at line 1178: Table 'events_statements_summary_by_digest' already exists -ERROR 1644 (HY000) at line 1598: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line 122: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line 147: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line 172: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line 185: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line 198: Table 'events_waits_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 211: Table 'events_waits_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 225: Table 'events_waits_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 238: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 250: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 259: Table 'file_instances' already exists +ERROR 1050 (42S01) at line 288: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 319: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line 332: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 362: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 391: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 432: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 446: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 456: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 466: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 475: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 483: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 492: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 503: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 511: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 556: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 600: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 679: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 699: Table 'threads' already exists +ERROR 1050 (42S01) at line 715: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 731: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 747: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 760: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 773: Table 'events_stages_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 786: Table 'events_stages_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 800: Table 'events_stages_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 812: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 858: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 904: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists +ERROR 1050 (42S01) at line 1128: Table 'users' already exists +ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists +ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists +ERROR 1644 (HY000) at line 1591: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -262,59 +250,56 @@ drop function test.user_func; create event test.user_event on schedule every 1 day do select "not supposed to be here"; update mysql.event set db='performance_schema' where name='user_event'; -Warning: Using a password on the command line interface can be insecure. -Warning: Using a password on the command line interface can be insecure. -ERROR 1050 (42S01) at line 100: Table 'cond_instances' already exists -ERROR 1050 (42S01) at line 125: Table 'events_waits_current' already exists -ERROR 1050 (42S01) at line 150: Table 'events_waits_history' already exists -ERROR 1050 (42S01) at line 175: Table 'events_waits_history_long' already exists -ERROR 1050 (42S01) at line 188: Table 'events_waits_summary_by_instance' already exists -ERROR 1050 (42S01) at line 201: Table 'events_waits_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 214: Table 'events_waits_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 228: Table 'events_waits_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 241: Table 'events_waits_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 253: Table 'events_waits_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 262: Table 'file_instances' already exists -ERROR 1050 (42S01) at line 291: Table 'file_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 322: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists -ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists -ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists -ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 705: Table 'threads' already exists -ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 864: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 910: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 956: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 988: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 1020: Table 'events_statements_summary_by_host_by_event_name' already exists -ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_user_by_event_name' already exists -ERROR 1050 (42S01) at line 1085: Table 'events_statements_summary_by_account_by_event_name' already exists -ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 1125: Table 'hosts' already exists -ERROR 1050 (42S01) at line 1134: Table 'users' already exists -ERROR 1050 (42S01) at line 1144: Table 'accounts' already exists -ERROR 1050 (42S01) at line 1178: Table 'events_statements_summary_by_digest' already exists -ERROR 1644 (HY000) at line 1598: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line 122: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line 147: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line 172: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line 185: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line 198: Table 'events_waits_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 211: Table 'events_waits_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 225: Table 'events_waits_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 238: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 250: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 259: Table 'file_instances' already exists +ERROR 1050 (42S01) at line 288: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 319: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line 332: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 362: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 391: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 432: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 446: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 456: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 466: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 475: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 483: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 492: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 503: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 511: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 556: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 600: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 679: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 699: Table 'threads' already exists +ERROR 1050 (42S01) at line 715: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 731: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 747: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 760: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 773: Table 'events_stages_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 786: Table 'events_stages_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 800: Table 'events_stages_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 812: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 858: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 904: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists +ERROR 1050 (42S01) at line 1128: Table 'users' already exists +ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists +ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists +ERROR 1644 (HY000) at line 1591: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.event where db='performance_schema'; name diff --git a/mysql-test/suite/perfschema/r/privilege.result b/mysql-test/suite/perfschema/r/privilege.result index 18c9a8b86f9..55c42c9a149 100644 --- a/mysql-test/suite/perfschema/r/privilege.result +++ b/mysql-test/suite/perfschema/r/privilege.result @@ -152,13 +152,13 @@ before insert on performance_schema.file_instances for each row begin end; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' create table test.t1(a int) engine=PERFORMANCE_SCHEMA; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.setup_instruments; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.events_waits_current; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.file_instances; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") insert into performance_schema.setup_instruments set name="foo"; ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments' @@ -250,13 +250,13 @@ before insert on performance_schema.file_instances for each row begin end; ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' create table test.t1(a int) engine=PERFORMANCE_SCHEMA; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.setup_instruments; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.events_waits_current; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.file_instances; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") insert into performance_schema.setup_instruments set name="foo"; ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments' @@ -348,13 +348,13 @@ before insert on performance_schema.file_instances for each row begin end; ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' create table test.t1(a int) engine=PERFORMANCE_SCHEMA; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.setup_instruments; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.events_waits_current; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.file_instances; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") insert into performance_schema.setup_instruments set name="foo"; ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments' @@ -446,13 +446,13 @@ before insert on performance_schema.file_instances for each row begin end; ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' create table test.t1(a int) engine=PERFORMANCE_SCHEMA; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.setup_instruments; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.events_waits_current; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") create table test.t1 like performance_schema.file_instances; -ERROR HY000: Can't create table 'test.t1' (errno: 131) +ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database") insert into performance_schema.setup_instruments set name="foo"; ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments' diff --git a/mysql-test/suite/perfschema/r/privilege_table_io.result b/mysql-test/suite/perfschema/r/privilege_table_io.result index eba7ed3c7e8..9dda2e321de 100644 --- a/mysql-test/suite/perfschema/r/privilege_table_io.result +++ b/mysql-test/suite/perfschema/r/privilege_table_io.result @@ -40,7 +40,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/relaylog.result b/mysql-test/suite/perfschema/r/relaylog.result index 195dcaa6917..c276507820a 100644 --- a/mysql-test/suite/perfschema/r/relaylog.result +++ b/mysql-test/suite/perfschema/r/relaylog.result @@ -1,7 +1,4 @@ include/master-slave.inc -Warnings: -Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure. -Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives. [connection master] drop table if exists test.t1; reset master; @@ -23,7 +20,7 @@ from performance_schema.file_summary_by_instance where file_name like "%master-%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE master-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY -master-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE +master-bin.index wait/io/file/sql/binlog_index NONE MANY NONE MANY select * from performance_schema.file_summary_by_instance where file_name like "%slave-%" order by file_name; FILE_NAME EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT COUNT_READ SUM_TIMER_READ MIN_TIMER_READ AVG_TIMER_READ MAX_TIMER_READ SUM_NUMBER_OF_BYTES_READ COUNT_WRITE SUM_TIMER_WRITE MIN_TIMER_WRITE AVG_TIMER_WRITE MAX_TIMER_WRITE SUM_NUMBER_OF_BYTES_WRITE COUNT_MISC SUM_TIMER_MISC MIN_TIMER_MISC AVG_TIMER_MISC MAX_TIMER_MISC @@ -39,7 +36,7 @@ from performance_schema.file_summary_by_instance where event_name like "%binlog%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE master-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY -master-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE +master-bin.index wait/io/file/sql/binlog_index NONE MANY NONE MANY select EVENT_NAME, if (count_read > 0, "MANY", "NONE") as COUNT_READ, @@ -50,7 +47,7 @@ from performance_schema.file_summary_by_event_name where event_name like "%binlog%" order by event_name; EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE wait/io/file/sql/binlog MANY MANY MANY MANY -wait/io/file/sql/binlog_index MANY NONE NONE NONE +wait/io/file/sql/binlog_index NONE MANY NONE MANY select EVENT_NAME, if (count_star > 0, "MANY", "NONE") as COUNT_STAR @@ -60,6 +57,7 @@ where event_name like "%MYSQL_BIN_LOG%" order by event_name; EVENT_NAME COUNT_STAR wait/synch/cond/sql/MYSQL_BIN_LOG::COND_prep_xids NONE +wait/synch/cond/sql/MYSQL_BIN_LOG::COND_queue_busy NONE wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index MANY wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids NONE "Expect no slave relay log" @@ -76,6 +74,7 @@ where event_name like "%MYSQL_RELAY_LOG%" and event_name not like "%MYSQL_RELAY_LOG::update_cond" order by event_name; EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT +wait/synch/cond/sql/MYSQL_RELAY_LOG::COND_queue_busy 0 0 0 0 0 wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index 0 0 0 0 0 "============ Performance schema on slave ============" select * from performance_schema.file_summary_by_instance @@ -96,10 +95,10 @@ where file_name like "%slave-%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE slave-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY -slave-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE +slave-bin.index wait/io/file/sql/binlog_index NONE MANY NONE MANY slave-relay-bin.000001 wait/io/file/sql/relaylog MANY MANY MANY MANY slave-relay-bin.000002 wait/io/file/sql/relaylog MANY MANY MANY MANY -slave-relay-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE +slave-relay-bin.index wait/io/file/sql/relaylog_index MANY MANY MANY MANY "Expect a slave binlog + binlog_index" select substring(file_name, locate("slave-", file_name)) as FILE_NAME, @@ -112,8 +111,7 @@ from performance_schema.file_summary_by_instance where event_name like "%binlog%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE slave-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY -slave-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE -slave-relay-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE +slave-bin.index wait/io/file/sql/binlog_index NONE MANY NONE MANY select EVENT_NAME, if (count_read > 0, "MANY", "NONE") as COUNT_READ, @@ -124,7 +122,7 @@ from performance_schema.file_summary_by_event_name where event_name like "%binlog%" order by event_name; EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE wait/io/file/sql/binlog MANY MANY MANY MANY -wait/io/file/sql/binlog_index MANY NONE MANY NONE +wait/io/file/sql/binlog_index NONE MANY NONE MANY select EVENT_NAME, if (count_star > 0, "MANY", "NONE") as COUNT_STAR @@ -134,6 +132,7 @@ where event_name like "%MYSQL_BIN_LOG%" order by event_name; EVENT_NAME COUNT_STAR wait/synch/cond/sql/MYSQL_BIN_LOG::COND_prep_xids NONE +wait/synch/cond/sql/MYSQL_BIN_LOG::COND_queue_busy NONE wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index MANY wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids NONE "Expect a slave relay log" @@ -153,6 +152,7 @@ order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE slave-relay-bin.000001 wait/io/file/sql/relaylog MANY MANY MANY MANY slave-relay-bin.000002 wait/io/file/sql/relaylog MANY MANY MANY MANY +slave-relay-bin.index wait/io/file/sql/relaylog_index MANY MANY MANY MANY select EVENT_NAME, if (count_read > 0, "MANY", "NONE") as COUNT_READ, @@ -163,7 +163,7 @@ from performance_schema.file_summary_by_event_name where event_name like "%relaylog%" order by event_name; EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE wait/io/file/sql/relaylog MANY MANY MANY MANY -wait/io/file/sql/relaylog_index MANY NONE NONE NONE +wait/io/file/sql/relaylog_index MANY MANY MANY MANY select EVENT_NAME, if (count_star > 0, "MANY", "NONE") as COUNT_STAR @@ -172,5 +172,6 @@ where event_name like "%MYSQL_RELAY_LOG%" and event_name not like "%MYSQL_RELAY_LOG::update_cond" order by event_name; EVENT_NAME COUNT_STAR +wait/synch/cond/sql/MYSQL_RELAY_LOG::COND_queue_busy NONE wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index MANY include/stop_slave.inc diff --git a/mysql-test/suite/perfschema/r/rollback_table_io.result b/mysql-test/suite/perfschema/r/rollback_table_io.result index a4053dd5bc3..ec1c1b86fb4 100644 --- a/mysql-test/suite/perfschema/r/rollback_table_io.result +++ b/mysql-test/suite/perfschema/r/rollback_table_io.result @@ -7,6 +7,7 @@ t1 CREATE TABLE `t1` ( `col2` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 insert into test.t1 values(1,'One'); +set default_storage_engine=InnoDB; drop table if exists test.marker; create table test.marker(a int); update performance_schema.setup_consumers set enabled='NO'; diff --git a/mysql-test/suite/perfschema/r/schema.result b/mysql-test/suite/perfschema/r/schema.result index 7f1e1190634..d3b5572c383 100644 --- a/mysql-test/suite/perfschema/r/schema.result +++ b/mysql-test/suite/perfschema/r/schema.result @@ -38,7 +38,6 @@ 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 @@ -649,38 +648,7 @@ 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; -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 +ERROR 42S02: Table 'performance_schema.host_cache' doesn't exist show create table hosts; Table Create Table hosts CREATE TABLE `hosts` ( diff --git a/mysql-test/suite/perfschema/r/server_init.result b/mysql-test/suite/perfschema/r/server_init.result index ed267aeb8c2..0f983ee968d 100644 --- a/mysql-test/suite/perfschema/r/server_init.result +++ b/mysql-test/suite/perfschema/r/server_init.result @@ -42,7 +42,7 @@ count(name) select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_log_throttle_qni"; count(name) -1 +0 select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_status"; count(name) @@ -58,7 +58,7 @@ count(name) select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_uuid_generator"; count(name) -1 +0 select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_delayed_status"; count(name) @@ -82,7 +82,7 @@ count(name) select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_manager"; count(name) -1 +0 select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_global_system_variables"; count(name) @@ -166,7 +166,7 @@ count(name) select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_manager"; count(name) -1 +0 select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_thread_cache"; count(name) diff --git a/mysql-test/suite/perfschema/r/setup_instruments_defaults.result b/mysql-test/suite/perfschema/r/setup_instruments_defaults.result index 531af43d798..2ea7d17a888 100644 --- a/mysql-test/suite/perfschema/r/setup_instruments_defaults.result +++ b/mysql-test/suite/perfschema/r/setup_instruments_defaults.result @@ -8,7 +8,6 @@ AND enabled = 'yes' AND timed = 'no' ORDER BY name; NAME ENABLED TIMED wait/synch/mutex/sql/LOCK_user_conn YES NO -wait/synch/mutex/sql/LOCK_uuid_generator YES NO SELECT * FROM performance_schema.setup_instruments WHERE name = 'wait/synch/mutex/sql/LOCK_thread_count' AND enabled = 'no' AND timed = 'no'; diff --git a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result index a273bbde92c..d725009d8fd 100644 --- a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result +++ b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result @@ -59,7 +59,7 @@ ERROR 42S02: Table 'mysqltest.does_not_exist' doesn't exist # The statement has the same length like in 3.2 but the error # message is now different and much longer. SELECT col2 FROM does_not_exist WHERE col1 A 0; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'A 0' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'A 0' at line 1 # 3.4 SELECT ending with server sending an error message. # Statement and error message are a bit longer than in 3.1 # because the table name is longer. diff --git a/mysql-test/suite/perfschema/r/stage_mdl_global.result b/mysql-test/suite/perfschema/r/stage_mdl_global.result index de5df8f189a..1a6f51a4acc 100644 --- a/mysql-test/suite/perfschema/r/stage_mdl_global.result +++ b/mysql-test/suite/perfschema/r/stage_mdl_global.result @@ -6,8 +6,6 @@ user1 statement/sql/flush flush tables with read lock username event_name nesting_event_type username event_name nesting_event_type user1 stage/sql/init STATEMENT -user1 stage/sql/Waiting for query cache lock STATEMENT -user1 stage/sql/init STATEMENT user1 stage/sql/query end STATEMENT user1 stage/sql/closing tables STATEMENT user1 stage/sql/freeing items STATEMENT diff --git a/mysql-test/suite/perfschema/r/start_server_disable_idle.result b/mysql-test/suite/perfschema/r/start_server_disable_idle.result index 7f3746f15e1..64648a79330 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_idle.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_idle.result @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_disable_stages.result b/mysql-test/suite/perfschema/r/start_server_disable_stages.result index bdc6e99ce1d..905e27f1347 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_stages.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_stages.result @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_disable_statements.result b/mysql-test/suite/perfschema/r/start_server_disable_statements.result index 61c3f5a7a87..512fa6fe462 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_statements.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_statements.result @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_disable_waits.result b/mysql-test/suite/perfschema/r/start_server_disable_waits.result index 5344a45e70e..d9150ec9ac7 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_waits.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_waits.result @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_innodb.result b/mysql-test/suite/perfschema/r/start_server_innodb.result index 4fa005de8d5..13b6406250a 100644 --- a/mysql-test/suite/perfschema/r/start_server_innodb.result +++ b/mysql-test/suite/perfschema/r/start_server_innodb.result @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_account.result b/mysql-test/suite/perfschema/r/start_server_no_account.result index b6320ee594d..cda9ca9722c 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_account.result +++ b/mysql-test/suite/perfschema/r/start_server_no_account.result @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result index b876365fa18..689c9ec94c0 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result index 415968733f6..3cc5dba7376 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_class.result b/mysql-test/suite/perfschema/r/start_server_no_file_class.result index 12a7d9b0fb1..27c76d3ede1 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result index af71c0e19a0..c1b3c14058d 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_host.result b/mysql-test/suite/perfschema/r/start_server_no_host.result index 98d6aaf0deb..51e693b53b4 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_host.result +++ b/mysql-test/suite/perfschema/r/start_server_no_host.result @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result index 13566a5ca81..79131abc2e5 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result index bbe50aa7b9c..0756da7589c 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result index 8f443e3e08e..a89f7a0ad1a 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result index 89af89e1314..5399344f675 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 0 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result index d2e31d6eda7..38d5eb3cd81 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result index 9365d908ec7..489884a179e 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result index 526b163a2b5..d114de58c3e 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 0 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result index 78b2d4aaad8..eed4a67f74d 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 0 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result index de41ea4e3f3..8ec63865763 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 0 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result index 33c20cf8dfd..1633a413ae9 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result index 3cbec7fe891..2218358dfad 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result index d304e0c8f49..423b7c07af0 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result index d7bb4ca598a..162036c67b6 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result index eef0a0d60ae..5f7bb2b7728 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 0 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result index 9a54dc8168c..b3ba8940d46 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 0 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result index b1fb2a4718a..03e3823c6d7 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 0 diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result index 7e95947dab0..db3ce741da7 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_user.result b/mysql-test/suite/perfschema/r/start_server_no_user.result index 96e80f3fefd..f04cbe1358f 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_user.result +++ b/mysql-test/suite/perfschema/r/start_server_no_user.result @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result index 63d80712f25..3781f25d8f1 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result index 705be71b828..524c8b12872 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 @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_off.result b/mysql-test/suite/perfschema/r/start_server_off.result index 264d71d2ecb..030448ecaa5 100644 --- a/mysql-test/suite/perfschema/r/start_server_off.result +++ b/mysql-test/suite/perfschema/r/start_server_off.result @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_on.result b/mysql-test/suite/perfschema/r/start_server_on.result index 4fa005de8d5..13b6406250a 100644 --- a/mysql-test/suite/perfschema/r/start_server_on.result +++ b/mysql-test/suite/perfschema/r/start_server_on.result @@ -90,7 +90,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/statement_digest.result b/mysql-test/suite/perfschema/r/statement_digest.result index c6a1cf16c66..dc6ab2ee663 100644 --- a/mysql-test/suite/perfschema/r/statement_digest.result +++ b/mysql-test/suite/perfschema/r/statement_digest.result @@ -75,28 +75,28 @@ Warning 1265 Data truncated for column 'c' at row 1 SELECT 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 -dee8f4f04e57a5e456c31892855e6835 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 -658a159558b029617bfa7c090827fc31 SELECT ? FROM t1 1 0 0 0 -66c495c9ee7e052e0db2212a0cd7a3cd SELECT ? FROM `t1` 1 0 0 0 -e7f8dc15f1156f57978116e457cc7488 SELECT ?, ... FROM t1 2 0 0 0 -5098d41dbf74d89d261b29400c46dae7 SELECT ? FROM t2 1 0 0 0 -3b8d5477aa795a19c9e9183e4ad04e6b SELECT ?, ... FROM t2 2 0 0 0 -5737343d989b1c42464fd3632614d25e INSERT INTO t1 VALUES (?) 1 1 0 0 -1e7fe109d5dd49394ee079690a029452 INSERT INTO t2 VALUES (?) 1 1 0 0 -d63092ea2fa59316f398af6283bf80a5 INSERT INTO t3 VALUES (...) 1 1 0 0 -7383272b3a17c661872524713abae82f INSERT INTO t4 VALUES (...) 1 1 0 0 -42e8c9d8a502b06ac931886d3ff1ed1e INSERT INTO t5 VALUES (...) 1 1 0 0 -db545539039d269501474510fbc2da56 INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0 -446dead39135f87b4fc4168f00dff254 INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0 -3ec23fcc5b568c4ad359703ff996e0bd INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0 -6b473a776aa59140774b6ee689e68c9e SELECT ? + ? 3 0 0 0 -b608da273ea6dffe2120354f751cc8ba SELECT ? 1 0 0 0 -30046d97cfdc44c95bdaa7f3987d0a20 CREATE SCHEMA statements_digest_temp 2 2 0 0 -8e40e6461f3ab4454ddb8f21b5cda3ba DROP SCHEMA statements_digest_temp 2 0 0 0 -b2a18812618a648d37136507aa1abf76 SELECT ? FROM t11 1 0 0 1 -26b3a8aaadea1ef0afd3658728b3b2c9 CREATE TABLE t11 ( c CHARACTER (?) ) 2 0 0 1 -fe695877d27d136594145ebd4f683491 INSERT INTO t11 VALUES (?) 1 1 1 0 -09dae9a52da4bcb4bd4f396e3f723980 SHOW WARNINGS 1 0 0 0 +d238cb191361f39845a6adb2961f5501 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 +85d75a1b361e6afe5460639bddfc88ed SELECT ? FROM t1 1 0 0 0 +83d5ef3dc373ad216098b07c72e61063 SELECT ? FROM `t1` 1 0 0 0 +ea6492426a33544a059bc12766c5ba3d SELECT ?, ... FROM t1 2 0 0 0 +c050a704c0817ec2865ead136ceea6ec SELECT ? FROM t2 1 0 0 0 +a98062477bd693dacfc0df96c68c5585 SELECT ?, ... FROM t2 2 0 0 0 +72470fa90a09ac60fb0ab822a3d6ade0 INSERT INTO t1 VALUES (?) 1 1 0 0 +3f5fd5225f11e3e8d5e8bda8ee6c1546 INSERT INTO t2 VALUES (?) 1 1 0 0 +2057d54e44b8760b5414781df21e53e5 INSERT INTO t3 VALUES (...) 1 1 0 0 +b6becf79cc1c5b9faf07bcd4680e87d1 INSERT INTO t4 VALUES (...) 1 1 0 0 +7d68bb708120922be9668e8c29b2ba7e INSERT INTO t5 VALUES (...) 1 1 0 0 +16760e44bae66c003e39919411b8adbb INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0 +29df714911c3f9b83460385a21b5386d INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0 +5504ad628fc868be29157ccf556c6175 INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0 +0babf2f70315be35a2a9ad6d3d800960 SELECT ? + ? 3 0 0 0 +060c9d59b5b13bc4ec6188ec4f2822b1 SELECT ? 1 0 0 0 +bce3f7384ae2ab78354b031184fde12d CREATE SCHEMA statements_digest_temp 2 2 0 0 +2a0e36afeaac85dc117c3856388a4fae DROP SCHEMA statements_digest_temp 2 0 0 0 +8761fd6b83357bdd00acd0b301cd1d43 SELECT ? FROM t11 1 0 0 1 +2707097430c8f6e7b8c60d15d1f3ff9a CREATE TABLE t11 ( c CHARACTER (?) ) 2 0 0 1 +503e81940feaf05afaafc435903f6bc3 INSERT INTO t11 VALUES (?) 1 1 1 0 +cb0f8f969018eb9b6019e9fe069f6e2a SHOW WARNINGS 1 0 0 0 #################################### # CLEANUP #################################### diff --git a/mysql-test/suite/perfschema/r/statement_digest_consumers.result b/mysql-test/suite/perfschema/r/statement_digest_consumers.result index c01ae691a8b..6daabcbd8bf 100644 --- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result +++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result @@ -88,28 +88,28 @@ Warning 1265 Data truncated for column 'c' at row 1 #################################### SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest; digest digest_text count_star -dee8f4f04e57a5e456c31892855e6835 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 -658a159558b029617bfa7c090827fc31 SELECT ? FROM t1 1 -66c495c9ee7e052e0db2212a0cd7a3cd SELECT ? FROM `t1` 1 -e7f8dc15f1156f57978116e457cc7488 SELECT ?, ... FROM t1 2 -5098d41dbf74d89d261b29400c46dae7 SELECT ? FROM t2 1 -3b8d5477aa795a19c9e9183e4ad04e6b SELECT ?, ... FROM t2 2 -5737343d989b1c42464fd3632614d25e INSERT INTO t1 VALUES (?) 1 -1e7fe109d5dd49394ee079690a029452 INSERT INTO t2 VALUES (?) 1 -d63092ea2fa59316f398af6283bf80a5 INSERT INTO t3 VALUES (...) 1 -7383272b3a17c661872524713abae82f INSERT INTO t4 VALUES (...) 1 -42e8c9d8a502b06ac931886d3ff1ed1e INSERT INTO t5 VALUES (...) 1 -db545539039d269501474510fbc2da56 INSERT INTO t1 VALUES (?) /* , ... */ 2 -446dead39135f87b4fc4168f00dff254 INSERT INTO t3 VALUES (...) /* , ... */ 1 -3ec23fcc5b568c4ad359703ff996e0bd INSERT INTO t5 VALUES (...) /* , ... */ 1 -6b473a776aa59140774b6ee689e68c9e SELECT ? + ? 3 -b608da273ea6dffe2120354f751cc8ba SELECT ? 1 -30046d97cfdc44c95bdaa7f3987d0a20 CREATE SCHEMA statements_digest_temp 2 -8e40e6461f3ab4454ddb8f21b5cda3ba DROP SCHEMA statements_digest_temp 2 -b2a18812618a648d37136507aa1abf76 SELECT ? FROM t11 1 -26b3a8aaadea1ef0afd3658728b3b2c9 CREATE TABLE t11 ( c CHARACTER (?) ) 2 -fe695877d27d136594145ebd4f683491 INSERT INTO t11 VALUES (?) 1 -09dae9a52da4bcb4bd4f396e3f723980 SHOW WARNINGS 1 +d238cb191361f39845a6adb2961f5501 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 +85d75a1b361e6afe5460639bddfc88ed SELECT ? FROM t1 1 +83d5ef3dc373ad216098b07c72e61063 SELECT ? FROM `t1` 1 +ea6492426a33544a059bc12766c5ba3d SELECT ?, ... FROM t1 2 +c050a704c0817ec2865ead136ceea6ec SELECT ? FROM t2 1 +a98062477bd693dacfc0df96c68c5585 SELECT ?, ... FROM t2 2 +72470fa90a09ac60fb0ab822a3d6ade0 INSERT INTO t1 VALUES (?) 1 +3f5fd5225f11e3e8d5e8bda8ee6c1546 INSERT INTO t2 VALUES (?) 1 +2057d54e44b8760b5414781df21e53e5 INSERT INTO t3 VALUES (...) 1 +b6becf79cc1c5b9faf07bcd4680e87d1 INSERT INTO t4 VALUES (...) 1 +7d68bb708120922be9668e8c29b2ba7e INSERT INTO t5 VALUES (...) 1 +16760e44bae66c003e39919411b8adbb INSERT INTO t1 VALUES (?) /* , ... */ 2 +29df714911c3f9b83460385a21b5386d INSERT INTO t3 VALUES (...) /* , ... */ 1 +5504ad628fc868be29157ccf556c6175 INSERT INTO t5 VALUES (...) /* , ... */ 1 +0babf2f70315be35a2a9ad6d3d800960 SELECT ? + ? 3 +060c9d59b5b13bc4ec6188ec4f2822b1 SELECT ? 1 +bce3f7384ae2ab78354b031184fde12d CREATE SCHEMA statements_digest_temp 2 +2a0e36afeaac85dc117c3856388a4fae DROP SCHEMA statements_digest_temp 2 +8761fd6b83357bdd00acd0b301cd1d43 SELECT ? FROM t11 1 +2707097430c8f6e7b8c60d15d1f3ff9a CREATE TABLE t11 ( c CHARACTER (?) ) 2 +503e81940feaf05afaafc435903f6bc3 INSERT INTO t11 VALUES (?) 1 +cb0f8f969018eb9b6019e9fe069f6e2a SHOW WARNINGS 1 SELECT digest, digest_text FROM performance_schema.events_statements_current; digest digest_text #################################### diff --git a/mysql-test/suite/perfschema/r/statement_digest_long_query.result b/mysql-test/suite/perfschema/r/statement_digest_long_query.result index c074b704147..c6a60a46cd4 100644 --- a/mysql-test/suite/perfschema/r/statement_digest_long_query.result +++ b/mysql-test/suite/perfschema/r/statement_digest_long_query.result @@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1 #################################### SELECT digest, digest_text, count_star FROM events_statements_summary_by_digest; digest digest_text count_star -56ae4a1bea5f5babaa469039be3fd979 TRUNCATE TABLE events_statements_summary_by_digest 1 -abda1fecf4bb4811f508a861272700a8 SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ... 1 +d01d4cae378e1362fa70663f43b189d1 TRUNCATE TABLE events_statements_summary_by_digest 1 +99d318822f9c746b71583a9d71b49fff 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 a0dbf56d48c..1952803291a 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result @@ -63,7 +63,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result index 19855924ab6..bd7ac2c995b 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result index 0dde7f5408d..3bfdf10401c 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result @@ -63,7 +63,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result index ee4d0445baf..6a31f6458d9 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result index 9d2904f2ae3..c630dbc7dcb 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result @@ -61,7 +61,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result index c8f5d3100b4..bee77262317 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result @@ -60,7 +60,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result index 944d3dd2e61..93320407993 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result @@ -61,7 +61,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result index 997838562ca..d60641bf68f 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result @@ -60,7 +60,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_off.result b/mysql-test/suite/perfschema/r/table_aggregate_off.result index 1f74e0dcb3b..cf7778b0c3e 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_off.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_off.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result index f3d8d996144..1cda3600046 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result @@ -63,7 +63,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result index ef619f555b4..5f951adfb00 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result index 852578cb83c..6c3c14fe190 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result @@ -63,7 +63,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result index 1139727f5fb..0ee9d266a59 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result index 18e3e473f63..6703860caa3 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result @@ -65,7 +65,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result index 1f7711b6a88..e918764c34c 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result @@ -64,7 +64,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result index 777e6aefb28..c7ea909d1b2 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result @@ -65,7 +65,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result index 16cfbcbc7e2..5f6c7dff212 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result @@ -64,7 +64,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result index f17b7c59f03..8c003f5e7bc 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result @@ -63,7 +63,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result index 7bfb0e79c14..79cae48d78a 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result index 0731e991cdc..52f5878c3ea 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result @@ -63,7 +63,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result index eb6e7699b3a..3957481897e 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result index 0af7102834c..791786246dd 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result @@ -65,7 +65,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result index de35029ac87..da16a14a51f 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result @@ -64,7 +64,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result index 1d0432aafb3..5ab36b8f109 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result @@ -65,7 +65,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result index 3b697344190..2393d357c93 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result @@ -64,7 +64,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result index 11d10132af4..73bbe77bc1b 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result @@ -65,7 +65,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result index 300d41bf2f7..9e7427f57f4 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result @@ -64,7 +64,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result index e21145b190f..06e910c777b 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result @@ -65,7 +65,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result index 2b9743a78d6..0d7bca40fbb 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result @@ -64,7 +64,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result index 7c713a0d95d..fd8d845c0be 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result @@ -63,7 +63,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result index da916174671..9b4fe6d14ab 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result index 8a917a421bb..f6ee9067ab3 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result @@ -63,7 +63,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result index ae82e88135f..a6d042bcd4a 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result @@ -62,7 +62,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result index cf0ab57f9ba..f41524bde4a 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result @@ -65,7 +65,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result index 628ef237ffd..d227366563a 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result @@ -64,7 +64,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result index a19fa183531..fd780e3204c 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result @@ -65,7 +65,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result index 3a3377799f3..4acefcaa5b1 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result @@ -64,7 +64,7 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 +performance_schema_max_statement_classes 170 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_schema.result b/mysql-test/suite/perfschema/r/table_schema.result index 731925578b1..2580b9eeff8 100644 --- a/mysql-test/suite/perfschema/r/table_schema.result +++ b/mysql-test/suite/perfschema/r/table_schema.result @@ -503,35 +503,6 @@ 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 |