diff options
Diffstat (limited to 'mysql-test/suite/perfschema')
131 files changed, 465 insertions, 931 deletions
diff --git a/mysql-test/suite/perfschema/include/connection_setup.inc b/mysql-test/suite/perfschema/include/connection_setup.inc index da57b6dd388..a661d43d063 100644 --- a/mysql-test/suite/perfschema/include/connection_setup.inc +++ b/mysql-test/suite/perfschema/include/connection_setup.inc @@ -48,7 +48,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---source ../include/no_protocol.inc +--source include/no_protocol.inc --source ../include/wait_for_pfs_thread_count.inc --disable_query_log diff --git a/mysql-test/suite/perfschema/include/digest_setup.inc b/mysql-test/suite/perfschema/include/digest_setup.inc index ed463f58d04..6efab880d32 100644 --- a/mysql-test/suite/perfschema/include/digest_setup.inc +++ b/mysql-test/suite/perfschema/include/digest_setup.inc @@ -1,5 +1,5 @@ # Making sure not to run when ps-protocol is set. ---source ../include/no_protocol.inc +--source include/no_protocol.inc --echo #################################### --echo # SETUP diff --git a/mysql-test/suite/perfschema/include/event_aggregate_setup.inc b/mysql-test/suite/perfschema/include/event_aggregate_setup.inc index 769ba5f8607..ec35e60d463 100644 --- a/mysql-test/suite/perfschema/include/event_aggregate_setup.inc +++ b/mysql-test/suite/perfschema/include/event_aggregate_setup.inc @@ -62,7 +62,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---source ../include/no_protocol.inc +--source include/no_protocol.inc --source ../include/wait_for_pfs_thread_count.inc --disable_query_log diff --git a/mysql-test/suite/perfschema/include/no_protocol.inc b/mysql-test/suite/perfschema/include/no_protocol.inc deleted file mode 100644 index 451c22f62e3..00000000000 --- a/mysql-test/suite/perfschema/include/no_protocol.inc +++ /dev/null @@ -1,10 +0,0 @@ -# Tests for the performance schema - -# The file with expected results fits only to a run without -# ps-protocol/sp-protocol/cursor-protocol/view-protocol. -if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL - + $VIEW_PROTOCOL > 0`) -{ - --skip Test requires: ps-protocol/sp-protocol/cursor-protocol/view-protocol disabled -} - diff --git a/mysql-test/suite/perfschema/include/sizing_auto.inc b/mysql-test/suite/perfschema/include/sizing_auto.inc index 4c3451ce8b5..3bb4db2276f 100644 --- a/mysql-test/suite/perfschema/include/sizing_auto.inc +++ b/mysql-test/suite/perfschema/include/sizing_auto.inc @@ -4,13 +4,21 @@ show variables like "table_open_cache"; show variables like "max_connections"; # open_files_limit depends on OS configuration (ulimit -n) #show variables like "open_files_limit"; -show variables like "%performance_schema%"; +show variables where + `Variable_name` != "performance_schema_max_statement_classes" and + `Variable_name` like "performance_schema%"; show status like "%performance_schema%"; # Each test script should provide a different test.cnf file, # with different settings. # This output will show the sizes computed automatically. # Note that this output is very dependent on the platform. +# The output of SHOW ENGINE PERFORMANCE_SCHEMA STATUS +# is very dependent on the platform, +# so it is not printed here to ensure stability of the .results files. +# To troubleshoot the performance schema memory consumption at different +# configuration settings, comment the following line. +# Debug only: -show engine performance_schema status; +# show engine performance_schema status; diff --git a/mysql-test/suite/perfschema/include/socket_event.inc b/mysql-test/suite/perfschema/include/socket_event.inc index ba81c37d5df..96c61045986 100644 --- a/mysql-test/suite/perfschema/include/socket_event.inc +++ b/mysql-test/suite/perfschema/include/socket_event.inc @@ -126,7 +126,7 @@ if($is_connect) # Connect is visible. # We hope that sleep 1 is long enough so that PERFORMANCE_SCHEMA # can remove this row before we collect the after action state. - let $wait_timeou= 5; + let $wait_timeout= 5; let $wait_condition= SELECT COUNT(*) = 0 $part; diff --git a/mysql-test/suite/perfschema/include/stage_setup.inc b/mysql-test/suite/perfschema/include/stage_setup.inc index 3558e43652e..639b1df8c02 100644 --- a/mysql-test/suite/perfschema/include/stage_setup.inc +++ b/mysql-test/suite/perfschema/include/stage_setup.inc @@ -24,7 +24,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---source ../include/no_protocol.inc +--source include/no_protocol.inc --disable_query_log diff --git a/mysql-test/suite/perfschema/include/start_server_common.inc b/mysql-test/suite/perfschema/include/start_server_common.inc index d15c3d48ded..41dcfd8ecb5 100644 --- a/mysql-test/suite/perfschema/include/start_server_common.inc +++ b/mysql-test/suite/perfschema/include/start_server_common.inc @@ -68,7 +68,9 @@ select * from performance_schema.users; --enable_result_log # This has a stable output, printing the result: -show variables like "performance_schema%"; +show variables where + `Variable_name` != "performance_schema_max_statement_classes" and + `Variable_name` like "performance_schema%"; # This has an unrepeatable output, it does depends too much on # - the platform hardware (sizeof structures, padding) diff --git a/mysql-test/suite/perfschema/include/table_aggregate_load.inc b/mysql-test/suite/perfschema/include/table_aggregate_load.inc index 242768ead9e..f42ebe1fc76 100644 --- a/mysql-test/suite/perfschema/include/table_aggregate_load.inc +++ b/mysql-test/suite/perfschema/include/table_aggregate_load.inc @@ -29,7 +29,9 @@ truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; # Check the configuration is ok -show variables like "performance_schema%"; +show variables where + `Variable_name` != "performance_schema_max_statement_classes" and + `Variable_name` like "performance_schema%"; show status like "performance_schema%"; echo "================== Step 1 =================="; diff --git a/mysql-test/suite/perfschema/include/table_aggregate_setup.inc b/mysql-test/suite/perfschema/include/table_aggregate_setup.inc index 8efdc8d2f24..522cdb9346d 100644 --- a/mysql-test/suite/perfschema/include/table_aggregate_setup.inc +++ b/mysql-test/suite/perfschema/include/table_aggregate_setup.inc @@ -67,7 +67,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---source ../include/no_protocol.inc +--source include/no_protocol.inc --source ../include/wait_for_pfs_thread_count.inc --disable_query_log diff --git a/mysql-test/suite/perfschema/r/aggregate.result b/mysql-test/suite/perfschema/r/aggregate.result index ab927f544cf..c8fa1cc2b24 100644 --- a/mysql-test/suite/perfschema/r/aggregate.result +++ b/mysql-test/suite/perfschema/r/aggregate.result @@ -1,4 +1,6 @@ "General cleanup" +set @aria_checkpoint_interval_save= @@global.aria_checkpoint_interval; +set @@global.aria_checkpoint_interval= 0; drop table if exists t1; update performance_schema.setup_instruments set enabled = 'NO'; update performance_schema.setup_consumers set enabled = 'NO'; @@ -116,3 +118,4 @@ update performance_schema.setup_consumers set enabled = 'YES'; update performance_schema.setup_instruments set enabled = 'YES', timed = 'YES'; drop table test.t1; +set @@global.aria_checkpoint_interval= @aria_checkpoint_interval_save; diff --git a/mysql-test/suite/perfschema/r/digest_null_literal.result b/mysql-test/suite/perfschema/r/digest_null_literal.result new file mode 100644 index 00000000000..b0cefbbbaaf --- /dev/null +++ b/mysql-test/suite/perfschema/r/digest_null_literal.result @@ -0,0 +1,27 @@ +TRUNCATE TABLE performance_schema.events_statements_summary_by_digest; +NULL +NULL +NULL +NULL +NULL NULL +NULL NULL +NULL NULL NULL 1 2 3 NULL NULL +NULL NULL NULL 1 2 3 NULL NULL +1 IS NULL +0 +2 IS NOT NULL +1 +1 IS NULL 2 IS NULL 3 IS NOT NULL 4 IS NOT NULL +0 0 1 1 +SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR +FROM performance_schema.events_statements_summary_by_digest; +SCHEMA_NAME DIGEST_TEXT COUNT_STAR +test TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 +test SELECT ? 1 +test SELECT ? FROM DUAL 1 +test SELECT ?, ... 2 +test SELECT ? IS NULL 1 +test SELECT ? IS NOT NULL 1 +test SELECT ? IS NULL , ? IS NULL , ? IS NOT NULL , ? IS NOT NULL 1 +test CREATE TABLE foo ( a INTEGER DEFAULT ? , b INTEGER NOT NULL DEFAULT ? , c INTEGER NOT NULL ) 1 +test DROP TABLE foo 1 diff --git a/mysql-test/suite/perfschema/r/digest_table_full.result b/mysql-test/suite/perfschema/r/digest_table_full.result index 9c0efb7b1ca..d910f29c91e 100644 --- a/mysql-test/suite/perfschema/r/digest_table_full.result +++ b/mysql-test/suite/perfschema/r/digest_table_full.result @@ -113,7 +113,7 @@ SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARN SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS NULL NULL NULL 55 32 1 2 -statements_digest 0e98ee6a98e296530ec59c12dbc08dfe TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 +statements_digest 8de787d0e3e3a062aea121ff528fcfce 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/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result index dafce4bf573..9081bfe5882 100644 --- a/mysql-test/suite/perfschema/r/ortho_iter.result +++ b/mysql-test/suite/perfschema/r/ortho_iter.result @@ -94,7 +94,9 @@ close pfs_cursor; signal sqlstate '01000' set message_text='Done', mysql_errno=12000; end $ -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -118,7 +120,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 @@ -127,31 +128,6 @@ performance_schema_session_connect_attrs_size 2048 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 call check_instrument("wait/synch/mutex/"); instr_name is_wait is_stage is_statement wait/synch/mutex/ 1 0 0 diff --git a/mysql-test/suite/perfschema/r/privilege_table_io.result b/mysql-test/suite/perfschema/r/privilege_table_io.result index 838d17e61fe..126b2a58fae 100644 --- a/mysql-test/suite/perfschema/r/privilege_table_io.result +++ b/mysql-test/suite/perfschema/r/privilege_table_io.result @@ -22,7 +22,9 @@ flush privileges; insert into test.marker set a = 1; insert into test.marker set a = 1; insert into test.marker set a = 1; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -46,7 +48,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/rpl_gtid_func.result b/mysql-test/suite/perfschema/r/rpl_gtid_func.result index 98342bc4869..bfe4e08a3c1 100644 --- a/mysql-test/suite/perfschema/r/rpl_gtid_func.result +++ b/mysql-test/suite/perfschema/r/rpl_gtid_func.result @@ -37,7 +37,7 @@ select digest, digest_text, count_star from performance_schema.events_statements_summary_by_digest where digest_text like "%in_%_digest%"; digest digest_text count_star -e315485f9cbc06befb4e59970905a034 SELECT ? AS in_master_digest 1 +f1cd3e758822a4ef0e1502ec30818476 SELECT ? AS in_master_digest 1 insert into test.marker values (2); **** On Slave **** select * from test.marker; @@ -64,7 +64,7 @@ select digest, digest_text, count_star from performance_schema.events_statements_summary_by_digest where digest_text like "%in_%_digest%"; digest digest_text count_star -bd2f53b41efcd037df41a3dd8bf3312a SELECT ? AS in_slave_digest 1 +c1cef2eb67ca48bb5d81d2e5e68aaf35 SELECT ? AS in_slave_digest 1 **** On Master **** delete from performance_schema.setup_objects where object_schema='master'; diff --git a/mysql-test/suite/perfschema/r/sizing_default.result b/mysql-test/suite/perfschema/r/sizing_default.result index ef7f7069c19..d7c4e321204 100644 --- a/mysql-test/suite/perfschema/r/sizing_default.result +++ b/mysql-test/suite/perfschema/r/sizing_default.result @@ -7,7 +7,9 @@ table_open_cache 2000 show variables like "max_connections"; Variable_name Value max_connections 151 -show variables like "%performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -31,7 +33,6 @@ performance_schema_max_rwlock_instances 9102 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 322 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 performance_schema_max_table_handles 4000 performance_schema_max_table_instances 12500 performance_schema_max_thread_classes 50 @@ -65,160 +66,3 @@ Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 -show engine performance_schema status; -Type Name Status -performance_schema events_waits_current.row_size 184 -performance_schema events_waits_current.row_count 2412 -performance_schema events_waits_history.row_size 184 -performance_schema events_waits_history.row_count 4020 -performance_schema events_waits_history.memory 739680 -performance_schema events_waits_history_long.row_size 184 -performance_schema events_waits_history_long.row_count 10000 -performance_schema events_waits_history_long.memory 1840000 -performance_schema (pfs_mutex_class).row_size 256 -performance_schema (pfs_mutex_class).row_count 200 -performance_schema (pfs_mutex_class).memory 51200 -performance_schema (pfs_rwlock_class).row_size 320 -performance_schema (pfs_rwlock_class).row_count 40 -performance_schema (pfs_rwlock_class).memory 12800 -performance_schema (pfs_cond_class).row_size 256 -performance_schema (pfs_cond_class).row_count 80 -performance_schema (pfs_cond_class).memory 20480 -performance_schema (pfs_thread_class).row_size 192 -performance_schema (pfs_thread_class).row_count 50 -performance_schema (pfs_thread_class).memory 9600 -performance_schema (pfs_file_class).row_size 320 -performance_schema (pfs_file_class).row_count 50 -performance_schema (pfs_file_class).memory 16000 -performance_schema mutex_instances.row_size 128 -performance_schema mutex_instances.row_count 15906 -performance_schema mutex_instances.memory 2035968 -performance_schema rwlock_instances.row_size 192 -performance_schema rwlock_instances.row_count 9102 -performance_schema rwlock_instances.memory 1747584 -performance_schema cond_instances.row_size 128 -performance_schema cond_instances.row_count 3504 -performance_schema cond_instances.memory 448512 -performance_schema threads.row_size 2816 -performance_schema threads.row_count 402 -performance_schema threads.memory 1132032 -performance_schema file_instances.row_size 704 -performance_schema file_instances.row_count 7693 -performance_schema file_instances.memory 5415872 -performance_schema (pfs_file_handle).row_size 8 -performance_schema (pfs_file_handle).row_count 32768 -performance_schema (pfs_file_handle).memory 262144 -performance_schema events_waits_summary_by_thread_by_event_name.row_size 32 -performance_schema events_waits_summary_by_thread_by_event_name.row_count 153966 -performance_schema events_waits_summary_by_thread_by_event_name.memory 4926912 -performance_schema (pfs_table_share).row_size 22208 -performance_schema (pfs_table_share).row_count 12500 -performance_schema (pfs_table_share).memory 277600000 -performance_schema (pfs_table).row_size 9280 -performance_schema (pfs_table).row_count 4000 -performance_schema (pfs_table).memory 37120000 -performance_schema setup_actors.row_size 256 -performance_schema setup_actors.row_count 100 -performance_schema setup_actors.memory 25600 -performance_schema setup_objects.row_size 448 -performance_schema setup_objects.row_count 100 -performance_schema setup_objects.memory 44800 -performance_schema (pfs_account).row_size 256 -performance_schema (pfs_account).row_count 100 -performance_schema (pfs_account).memory 25600 -performance_schema events_waits_summary_by_account_by_event_name.row_size 32 -performance_schema events_waits_summary_by_account_by_event_name.row_count 38300 -performance_schema events_waits_summary_by_account_by_event_name.memory 1225600 -performance_schema events_waits_summary_by_user_by_event_name.row_size 32 -performance_schema events_waits_summary_by_user_by_event_name.row_count 38300 -performance_schema events_waits_summary_by_user_by_event_name.memory 1225600 -performance_schema events_waits_summary_by_host_by_event_name.row_size 32 -performance_schema events_waits_summary_by_host_by_event_name.row_count 38300 -performance_schema events_waits_summary_by_host_by_event_name.memory 1225600 -performance_schema (pfs_user).row_size 128 -performance_schema (pfs_user).row_count 100 -performance_schema (pfs_user).memory 12800 -performance_schema (pfs_host).row_size 128 -performance_schema (pfs_host).row_count 100 -performance_schema (pfs_host).memory 12800 -performance_schema (pfs_stage_class).row_size 256 -performance_schema (pfs_stage_class).row_count 150 -performance_schema (pfs_stage_class).memory 38400 -performance_schema events_stages_history.row_size 88 -performance_schema events_stages_history.row_count 4020 -performance_schema events_stages_history.memory 353760 -performance_schema events_stages_history_long.row_size 88 -performance_schema events_stages_history_long.row_count 10000 -performance_schema events_stages_history_long.memory 880000 -performance_schema events_stages_summary_by_thread_by_event_name.row_size 32 -performance_schema events_stages_summary_by_thread_by_event_name.row_count 60300 -performance_schema events_stages_summary_by_thread_by_event_name.memory 1929600 -performance_schema events_stages_summary_global_by_event_name.row_size 32 -performance_schema events_stages_summary_global_by_event_name.row_count 150 -performance_schema events_stages_summary_global_by_event_name.memory 4800 -performance_schema events_stages_summary_by_account_by_event_name.row_size 32 -performance_schema events_stages_summary_by_account_by_event_name.row_count 15000 -performance_schema events_stages_summary_by_account_by_event_name.memory 480000 -performance_schema events_stages_summary_by_user_by_event_name.row_size 32 -performance_schema events_stages_summary_by_user_by_event_name.row_count 15000 -performance_schema events_stages_summary_by_user_by_event_name.memory 480000 -performance_schema events_stages_summary_by_host_by_event_name.row_size 32 -performance_schema events_stages_summary_by_host_by_event_name.row_count 15000 -performance_schema events_stages_summary_by_host_by_event_name.memory 480000 -performance_schema (pfs_statement_class).row_size 192 -performance_schema (pfs_statement_class).row_count 168 -performance_schema (pfs_statement_class).memory 32256 -performance_schema events_statements_history.row_size 3024 -performance_schema events_statements_history.row_count 4020 -performance_schema events_statements_history.memory 12156480 -performance_schema events_statements_history_long.row_size 3024 -performance_schema events_statements_history_long.row_count 10000 -performance_schema events_statements_history_long.memory 30240000 -performance_schema events_statements_summary_by_thread_by_event_name.row_size 184 -performance_schema events_statements_summary_by_thread_by_event_name.row_count 67536 -performance_schema events_statements_summary_by_thread_by_event_name.memory 12426624 -performance_schema events_statements_summary_global_by_event_name.row_size 184 -performance_schema events_statements_summary_global_by_event_name.row_count 168 -performance_schema events_statements_summary_global_by_event_name.memory 30912 -performance_schema events_statements_summary_by_account_by_event_name.row_size 184 -performance_schema events_statements_summary_by_account_by_event_name.row_count 16800 -performance_schema events_statements_summary_by_account_by_event_name.memory 3091200 -performance_schema events_statements_summary_by_user_by_event_name.row_size 184 -performance_schema events_statements_summary_by_user_by_event_name.row_count 16800 -performance_schema events_statements_summary_by_user_by_event_name.memory 3091200 -performance_schema events_statements_summary_by_host_by_event_name.row_size 184 -performance_schema events_statements_summary_by_host_by_event_name.row_count 16800 -performance_schema events_statements_summary_by_host_by_event_name.memory 3091200 -performance_schema events_statements_current.row_size 3024 -performance_schema events_statements_current.row_count 402 -performance_schema events_statements_current.memory 1215648 -performance_schema (pfs_socket_class).row_size 320 -performance_schema (pfs_socket_class).row_count 10 -performance_schema (pfs_socket_class).memory 3200 -performance_schema socket_instances.row_size 320 -performance_schema socket_instances.row_count 322 -performance_schema socket_instances.memory 103040 -performance_schema events_statements_summary_by_digest.row_size 1472 -performance_schema events_statements_summary_by_digest.row_count 10000 -performance_schema events_statements_summary_by_digest.memory 14720000 -performance_schema session_connect_attrs.row_size 402 -performance_schema session_connect_attrs.row_count 512 -performance_schema session_connect_attrs.memory 205824 -performance_schema (account_hash).count 2 -performance_schema (account_hash).size 100 -performance_schema (digest_hash).count 0 -performance_schema (digest_hash).size 10000 -performance_schema (filename_hash).count 0 -performance_schema (filename_hash).size 7693 -performance_schema (host_hash).count 2 -performance_schema (host_hash).size 100 -performance_schema (setup_actor_hash).count 1 -performance_schema (setup_actor_hash).size 100 -performance_schema (setup_object_hash).count 4 -performance_schema (setup_object_hash).size 100 -performance_schema (table_share_hash).count 80 -performance_schema (table_share_hash).size 12500 -performance_schema (user_hash).count 2 -performance_schema (user_hash).size 100 -performance_schema host_cache.size 336 -performance_schema performance_schema.memory 422231328 diff --git a/mysql-test/suite/perfschema/r/sizing_high.result b/mysql-test/suite/perfschema/r/sizing_high.result index 4d63c970782..c7c7b065992 100644 --- a/mysql-test/suite/perfschema/r/sizing_high.result +++ b/mysql-test/suite/perfschema/r/sizing_high.result @@ -7,7 +7,9 @@ table_open_cache 400 show variables like "max_connections"; Variable_name Value max_connections 200 -show variables like "%performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -31,7 +33,6 @@ performance_schema_max_rwlock_instances 30800 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 420 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 performance_schema_max_table_handles 800 performance_schema_max_table_instances 12500 performance_schema_max_thread_classes 50 @@ -65,160 +66,3 @@ Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 -show engine performance_schema status; -Type Name Status -performance_schema events_waits_current.row_size 184 -performance_schema events_waits_current.row_count 3000 -performance_schema events_waits_history.row_size 184 -performance_schema events_waits_history.row_count 5000 -performance_schema events_waits_history.memory 920000 -performance_schema events_waits_history_long.row_size 184 -performance_schema events_waits_history_long.row_count 10000 -performance_schema events_waits_history_long.memory 1840000 -performance_schema (pfs_mutex_class).row_size 256 -performance_schema (pfs_mutex_class).row_count 200 -performance_schema (pfs_mutex_class).memory 51200 -performance_schema (pfs_rwlock_class).row_size 320 -performance_schema (pfs_rwlock_class).row_count 40 -performance_schema (pfs_rwlock_class).memory 12800 -performance_schema (pfs_cond_class).row_size 256 -performance_schema (pfs_cond_class).row_count 80 -performance_schema (pfs_cond_class).memory 20480 -performance_schema (pfs_thread_class).row_size 192 -performance_schema (pfs_thread_class).row_count 50 -performance_schema (pfs_thread_class).memory 9600 -performance_schema (pfs_file_class).row_size 320 -performance_schema (pfs_file_class).row_count 50 -performance_schema (pfs_file_class).memory 16000 -performance_schema mutex_instances.row_size 128 -performance_schema mutex_instances.row_count 52200 -performance_schema mutex_instances.memory 6681600 -performance_schema rwlock_instances.row_size 192 -performance_schema rwlock_instances.row_count 30800 -performance_schema rwlock_instances.memory 5913600 -performance_schema cond_instances.row_size 128 -performance_schema cond_instances.row_count 10900 -performance_schema cond_instances.memory 1395200 -performance_schema threads.row_size 2816 -performance_schema threads.row_count 500 -performance_schema threads.memory 1408000 -performance_schema file_instances.row_size 704 -performance_schema file_instances.row_count 23385 -performance_schema file_instances.memory 16463040 -performance_schema (pfs_file_handle).row_size 8 -performance_schema (pfs_file_handle).row_count 32768 -performance_schema (pfs_file_handle).memory 262144 -performance_schema events_waits_summary_by_thread_by_event_name.row_size 32 -performance_schema events_waits_summary_by_thread_by_event_name.row_count 191500 -performance_schema events_waits_summary_by_thread_by_event_name.memory 6128000 -performance_schema (pfs_table_share).row_size 22208 -performance_schema (pfs_table_share).row_count 12500 -performance_schema (pfs_table_share).memory 277600000 -performance_schema (pfs_table).row_size 9280 -performance_schema (pfs_table).row_count 800 -performance_schema (pfs_table).memory 7424000 -performance_schema setup_actors.row_size 256 -performance_schema setup_actors.row_count 100 -performance_schema setup_actors.memory 25600 -performance_schema setup_objects.row_size 448 -performance_schema setup_objects.row_count 100 -performance_schema setup_objects.memory 44800 -performance_schema (pfs_account).row_size 256 -performance_schema (pfs_account).row_count 100 -performance_schema (pfs_account).memory 25600 -performance_schema events_waits_summary_by_account_by_event_name.row_size 32 -performance_schema events_waits_summary_by_account_by_event_name.row_count 38300 -performance_schema events_waits_summary_by_account_by_event_name.memory 1225600 -performance_schema events_waits_summary_by_user_by_event_name.row_size 32 -performance_schema events_waits_summary_by_user_by_event_name.row_count 38300 -performance_schema events_waits_summary_by_user_by_event_name.memory 1225600 -performance_schema events_waits_summary_by_host_by_event_name.row_size 32 -performance_schema events_waits_summary_by_host_by_event_name.row_count 38300 -performance_schema events_waits_summary_by_host_by_event_name.memory 1225600 -performance_schema (pfs_user).row_size 128 -performance_schema (pfs_user).row_count 100 -performance_schema (pfs_user).memory 12800 -performance_schema (pfs_host).row_size 128 -performance_schema (pfs_host).row_count 100 -performance_schema (pfs_host).memory 12800 -performance_schema (pfs_stage_class).row_size 256 -performance_schema (pfs_stage_class).row_count 150 -performance_schema (pfs_stage_class).memory 38400 -performance_schema events_stages_history.row_size 88 -performance_schema events_stages_history.row_count 5000 -performance_schema events_stages_history.memory 440000 -performance_schema events_stages_history_long.row_size 88 -performance_schema events_stages_history_long.row_count 10000 -performance_schema events_stages_history_long.memory 880000 -performance_schema events_stages_summary_by_thread_by_event_name.row_size 32 -performance_schema events_stages_summary_by_thread_by_event_name.row_count 75000 -performance_schema events_stages_summary_by_thread_by_event_name.memory 2400000 -performance_schema events_stages_summary_global_by_event_name.row_size 32 -performance_schema events_stages_summary_global_by_event_name.row_count 150 -performance_schema events_stages_summary_global_by_event_name.memory 4800 -performance_schema events_stages_summary_by_account_by_event_name.row_size 32 -performance_schema events_stages_summary_by_account_by_event_name.row_count 15000 -performance_schema events_stages_summary_by_account_by_event_name.memory 480000 -performance_schema events_stages_summary_by_user_by_event_name.row_size 32 -performance_schema events_stages_summary_by_user_by_event_name.row_count 15000 -performance_schema events_stages_summary_by_user_by_event_name.memory 480000 -performance_schema events_stages_summary_by_host_by_event_name.row_size 32 -performance_schema events_stages_summary_by_host_by_event_name.row_count 15000 -performance_schema events_stages_summary_by_host_by_event_name.memory 480000 -performance_schema (pfs_statement_class).row_size 192 -performance_schema (pfs_statement_class).row_count 168 -performance_schema (pfs_statement_class).memory 32256 -performance_schema events_statements_history.row_size 3024 -performance_schema events_statements_history.row_count 5000 -performance_schema events_statements_history.memory 15120000 -performance_schema events_statements_history_long.row_size 3024 -performance_schema events_statements_history_long.row_count 10000 -performance_schema events_statements_history_long.memory 30240000 -performance_schema events_statements_summary_by_thread_by_event_name.row_size 184 -performance_schema events_statements_summary_by_thread_by_event_name.row_count 84000 -performance_schema events_statements_summary_by_thread_by_event_name.memory 15456000 -performance_schema events_statements_summary_global_by_event_name.row_size 184 -performance_schema events_statements_summary_global_by_event_name.row_count 168 -performance_schema events_statements_summary_global_by_event_name.memory 30912 -performance_schema events_statements_summary_by_account_by_event_name.row_size 184 -performance_schema events_statements_summary_by_account_by_event_name.row_count 16800 -performance_schema events_statements_summary_by_account_by_event_name.memory 3091200 -performance_schema events_statements_summary_by_user_by_event_name.row_size 184 -performance_schema events_statements_summary_by_user_by_event_name.row_count 16800 -performance_schema events_statements_summary_by_user_by_event_name.memory 3091200 -performance_schema events_statements_summary_by_host_by_event_name.row_size 184 -performance_schema events_statements_summary_by_host_by_event_name.row_count 16800 -performance_schema events_statements_summary_by_host_by_event_name.memory 3091200 -performance_schema events_statements_current.row_size 3024 -performance_schema events_statements_current.row_count 500 -performance_schema events_statements_current.memory 1512000 -performance_schema (pfs_socket_class).row_size 320 -performance_schema (pfs_socket_class).row_count 10 -performance_schema (pfs_socket_class).memory 3200 -performance_schema socket_instances.row_size 320 -performance_schema socket_instances.row_count 420 -performance_schema socket_instances.memory 134400 -performance_schema events_statements_summary_by_digest.row_size 1472 -performance_schema events_statements_summary_by_digest.row_count 10000 -performance_schema events_statements_summary_by_digest.memory 14720000 -performance_schema session_connect_attrs.row_size 500 -performance_schema session_connect_attrs.row_count 512 -performance_schema session_connect_attrs.memory 256000 -performance_schema (account_hash).count 2 -performance_schema (account_hash).size 100 -performance_schema (digest_hash).count 0 -performance_schema (digest_hash).size 10000 -performance_schema (filename_hash).count 0 -performance_schema (filename_hash).size 23385 -performance_schema (host_hash).count 2 -performance_schema (host_hash).size 100 -performance_schema (setup_actor_hash).count 1 -performance_schema (setup_actor_hash).size 100 -performance_schema (setup_object_hash).count 4 -performance_schema (setup_object_hash).size 100 -performance_schema (table_share_hash).count 80 -performance_schema (table_share_hash).size 12500 -performance_schema (user_hash).count 2 -performance_schema (user_hash).size 100 -performance_schema host_cache.size 336 -performance_schema performance_schema.memory 421925632 diff --git a/mysql-test/suite/perfschema/r/sizing_low.result b/mysql-test/suite/perfschema/r/sizing_low.result index d5aab2c2df3..213cc0b5f74 100644 --- a/mysql-test/suite/perfschema/r/sizing_low.result +++ b/mysql-test/suite/perfschema/r/sizing_low.result @@ -7,7 +7,9 @@ table_open_cache 100 show variables like "max_connections"; Variable_name Value max_connections 50 -show variables like "%performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 10 @@ -31,7 +33,6 @@ performance_schema_max_rwlock_instances 1612 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 67 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 performance_schema_max_table_handles 112 performance_schema_max_table_instances 445 performance_schema_max_thread_classes 50 @@ -65,160 +66,3 @@ Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 -show engine performance_schema status; -Type Name Status -performance_schema events_waits_current.row_size 184 -performance_schema events_waits_current.row_count 672 -performance_schema events_waits_history.row_size 184 -performance_schema events_waits_history.row_count 560 -performance_schema events_waits_history.memory 103040 -performance_schema events_waits_history_long.row_size 184 -performance_schema events_waits_history_long.row_count 100 -performance_schema events_waits_history_long.memory 18400 -performance_schema (pfs_mutex_class).row_size 256 -performance_schema (pfs_mutex_class).row_count 200 -performance_schema (pfs_mutex_class).memory 51200 -performance_schema (pfs_rwlock_class).row_size 320 -performance_schema (pfs_rwlock_class).row_count 40 -performance_schema (pfs_rwlock_class).memory 12800 -performance_schema (pfs_cond_class).row_size 256 -performance_schema (pfs_cond_class).row_count 80 -performance_schema (pfs_cond_class).memory 20480 -performance_schema (pfs_thread_class).row_size 192 -performance_schema (pfs_thread_class).row_count 50 -performance_schema (pfs_thread_class).memory 9600 -performance_schema (pfs_file_class).row_size 320 -performance_schema (pfs_file_class).row_count 50 -performance_schema (pfs_file_class).memory 16000 -performance_schema mutex_instances.row_size 128 -performance_schema mutex_instances.row_count 2945 -performance_schema mutex_instances.memory 376960 -performance_schema rwlock_instances.row_size 192 -performance_schema rwlock_instances.row_count 1612 -performance_schema rwlock_instances.memory 309504 -performance_schema cond_instances.row_size 128 -performance_schema cond_instances.row_count 612 -performance_schema cond_instances.memory 78336 -performance_schema threads.row_size 2816 -performance_schema threads.row_count 112 -performance_schema threads.memory 315392 -performance_schema file_instances.row_size 704 -performance_schema file_instances.row_count 1556 -performance_schema file_instances.memory 1095424 -performance_schema (pfs_file_handle).row_size 8 -performance_schema (pfs_file_handle).row_count 32768 -performance_schema (pfs_file_handle).memory 262144 -performance_schema events_waits_summary_by_thread_by_event_name.row_size 32 -performance_schema events_waits_summary_by_thread_by_event_name.row_count 42896 -performance_schema events_waits_summary_by_thread_by_event_name.memory 1372672 -performance_schema (pfs_table_share).row_size 22208 -performance_schema (pfs_table_share).row_count 445 -performance_schema (pfs_table_share).memory 9882560 -performance_schema (pfs_table).row_size 9280 -performance_schema (pfs_table).row_count 112 -performance_schema (pfs_table).memory 1039360 -performance_schema setup_actors.row_size 256 -performance_schema setup_actors.row_count 100 -performance_schema setup_actors.memory 25600 -performance_schema setup_objects.row_size 448 -performance_schema setup_objects.row_count 100 -performance_schema setup_objects.memory 44800 -performance_schema (pfs_account).row_size 256 -performance_schema (pfs_account).row_count 10 -performance_schema (pfs_account).memory 2560 -performance_schema events_waits_summary_by_account_by_event_name.row_size 32 -performance_schema events_waits_summary_by_account_by_event_name.row_count 3830 -performance_schema events_waits_summary_by_account_by_event_name.memory 122560 -performance_schema events_waits_summary_by_user_by_event_name.row_size 32 -performance_schema events_waits_summary_by_user_by_event_name.row_count 1915 -performance_schema events_waits_summary_by_user_by_event_name.memory 61280 -performance_schema events_waits_summary_by_host_by_event_name.row_size 32 -performance_schema events_waits_summary_by_host_by_event_name.row_count 7660 -performance_schema events_waits_summary_by_host_by_event_name.memory 245120 -performance_schema (pfs_user).row_size 128 -performance_schema (pfs_user).row_count 5 -performance_schema (pfs_user).memory 640 -performance_schema (pfs_host).row_size 128 -performance_schema (pfs_host).row_count 20 -performance_schema (pfs_host).memory 2560 -performance_schema (pfs_stage_class).row_size 256 -performance_schema (pfs_stage_class).row_count 150 -performance_schema (pfs_stage_class).memory 38400 -performance_schema events_stages_history.row_size 88 -performance_schema events_stages_history.row_count 560 -performance_schema events_stages_history.memory 49280 -performance_schema events_stages_history_long.row_size 88 -performance_schema events_stages_history_long.row_count 100 -performance_schema events_stages_history_long.memory 8800 -performance_schema events_stages_summary_by_thread_by_event_name.row_size 32 -performance_schema events_stages_summary_by_thread_by_event_name.row_count 16800 -performance_schema events_stages_summary_by_thread_by_event_name.memory 537600 -performance_schema events_stages_summary_global_by_event_name.row_size 32 -performance_schema events_stages_summary_global_by_event_name.row_count 150 -performance_schema events_stages_summary_global_by_event_name.memory 4800 -performance_schema events_stages_summary_by_account_by_event_name.row_size 32 -performance_schema events_stages_summary_by_account_by_event_name.row_count 1500 -performance_schema events_stages_summary_by_account_by_event_name.memory 48000 -performance_schema events_stages_summary_by_user_by_event_name.row_size 32 -performance_schema events_stages_summary_by_user_by_event_name.row_count 750 -performance_schema events_stages_summary_by_user_by_event_name.memory 24000 -performance_schema events_stages_summary_by_host_by_event_name.row_size 32 -performance_schema events_stages_summary_by_host_by_event_name.row_count 3000 -performance_schema events_stages_summary_by_host_by_event_name.memory 96000 -performance_schema (pfs_statement_class).row_size 192 -performance_schema (pfs_statement_class).row_count 168 -performance_schema (pfs_statement_class).memory 32256 -performance_schema events_statements_history.row_size 3024 -performance_schema events_statements_history.row_count 560 -performance_schema events_statements_history.memory 1693440 -performance_schema events_statements_history_long.row_size 3024 -performance_schema events_statements_history_long.row_count 100 -performance_schema events_statements_history_long.memory 302400 -performance_schema events_statements_summary_by_thread_by_event_name.row_size 184 -performance_schema events_statements_summary_by_thread_by_event_name.row_count 18816 -performance_schema events_statements_summary_by_thread_by_event_name.memory 3462144 -performance_schema events_statements_summary_global_by_event_name.row_size 184 -performance_schema events_statements_summary_global_by_event_name.row_count 168 -performance_schema events_statements_summary_global_by_event_name.memory 30912 -performance_schema events_statements_summary_by_account_by_event_name.row_size 184 -performance_schema events_statements_summary_by_account_by_event_name.row_count 1680 -performance_schema events_statements_summary_by_account_by_event_name.memory 309120 -performance_schema events_statements_summary_by_user_by_event_name.row_size 184 -performance_schema events_statements_summary_by_user_by_event_name.row_count 840 -performance_schema events_statements_summary_by_user_by_event_name.memory 154560 -performance_schema events_statements_summary_by_host_by_event_name.row_size 184 -performance_schema events_statements_summary_by_host_by_event_name.row_count 3360 -performance_schema events_statements_summary_by_host_by_event_name.memory 618240 -performance_schema events_statements_current.row_size 3024 -performance_schema events_statements_current.row_count 112 -performance_schema events_statements_current.memory 338688 -performance_schema (pfs_socket_class).row_size 320 -performance_schema (pfs_socket_class).row_count 10 -performance_schema (pfs_socket_class).memory 3200 -performance_schema socket_instances.row_size 320 -performance_schema socket_instances.row_count 67 -performance_schema socket_instances.memory 21440 -performance_schema events_statements_summary_by_digest.row_size 1472 -performance_schema events_statements_summary_by_digest.row_count 1000 -performance_schema events_statements_summary_by_digest.memory 1472000 -performance_schema session_connect_attrs.row_size 112 -performance_schema session_connect_attrs.row_count 512 -performance_schema session_connect_attrs.memory 57344 -performance_schema (account_hash).count 2 -performance_schema (account_hash).size 10 -performance_schema (digest_hash).count 0 -performance_schema (digest_hash).size 1000 -performance_schema (filename_hash).count 0 -performance_schema (filename_hash).size 1556 -performance_schema (host_hash).count 2 -performance_schema (host_hash).size 20 -performance_schema (setup_actor_hash).count 1 -performance_schema (setup_actor_hash).size 100 -performance_schema (setup_object_hash).count 4 -performance_schema (setup_object_hash).size 100 -performance_schema (table_share_hash).count 80 -performance_schema (table_share_hash).size 445 -performance_schema (user_hash).count 2 -performance_schema (user_hash).size 5 -performance_schema host_cache.size 336 -performance_schema performance_schema.memory 24771616 diff --git a/mysql-test/suite/perfschema/r/sizing_med.result b/mysql-test/suite/perfschema/r/sizing_med.result index c2e7a4df4bf..fbe703c5ff5 100644 --- a/mysql-test/suite/perfschema/r/sizing_med.result +++ b/mysql-test/suite/perfschema/r/sizing_med.result @@ -7,7 +7,9 @@ table_open_cache 401 show variables like "max_connections"; Variable_name Value max_connections 152 -show variables like "%performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -31,7 +33,6 @@ performance_schema_max_rwlock_instances 2222 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 232 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 performance_schema_max_table_handles 573 performance_schema_max_table_instances 556 performance_schema_max_thread_classes 50 @@ -65,160 +66,3 @@ Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 -show engine performance_schema status; -Type Name Status -performance_schema events_waits_current.row_size 184 -performance_schema events_waits_current.row_count 1734 -performance_schema events_waits_history.row_size 184 -performance_schema events_waits_history.row_count 2890 -performance_schema events_waits_history.memory 531760 -performance_schema events_waits_history_long.row_size 184 -performance_schema events_waits_history_long.row_count 1000 -performance_schema events_waits_history_long.memory 184000 -performance_schema (pfs_mutex_class).row_size 256 -performance_schema (pfs_mutex_class).row_count 200 -performance_schema (pfs_mutex_class).memory 51200 -performance_schema (pfs_rwlock_class).row_size 320 -performance_schema (pfs_rwlock_class).row_count 40 -performance_schema (pfs_rwlock_class).memory 12800 -performance_schema (pfs_cond_class).row_size 256 -performance_schema (pfs_cond_class).row_count 80 -performance_schema (pfs_cond_class).memory 20480 -performance_schema (pfs_thread_class).row_size 192 -performance_schema (pfs_thread_class).row_count 50 -performance_schema (pfs_thread_class).memory 9600 -performance_schema (pfs_file_class).row_size 320 -performance_schema (pfs_file_class).row_count 50 -performance_schema (pfs_file_class).memory 16000 -performance_schema mutex_instances.row_size 128 -performance_schema mutex_instances.row_count 4230 -performance_schema mutex_instances.memory 541440 -performance_schema rwlock_instances.row_size 192 -performance_schema rwlock_instances.row_count 2222 -performance_schema rwlock_instances.memory 426624 -performance_schema cond_instances.row_size 128 -performance_schema cond_instances.row_count 1079 -performance_schema cond_instances.memory 138112 -performance_schema threads.row_size 2816 -performance_schema threads.row_count 289 -performance_schema threads.memory 813824 -performance_schema file_instances.row_size 704 -performance_schema file_instances.row_count 1754 -performance_schema file_instances.memory 1234816 -performance_schema (pfs_file_handle).row_size 8 -performance_schema (pfs_file_handle).row_count 32768 -performance_schema (pfs_file_handle).memory 262144 -performance_schema events_waits_summary_by_thread_by_event_name.row_size 32 -performance_schema events_waits_summary_by_thread_by_event_name.row_count 110687 -performance_schema events_waits_summary_by_thread_by_event_name.memory 3541984 -performance_schema (pfs_table_share).row_size 22208 -performance_schema (pfs_table_share).row_count 556 -performance_schema (pfs_table_share).memory 12347648 -performance_schema (pfs_table).row_size 9280 -performance_schema (pfs_table).row_count 573 -performance_schema (pfs_table).memory 5317440 -performance_schema setup_actors.row_size 256 -performance_schema setup_actors.row_count 100 -performance_schema setup_actors.memory 25600 -performance_schema setup_objects.row_size 448 -performance_schema setup_objects.row_count 100 -performance_schema setup_objects.memory 44800 -performance_schema (pfs_account).row_size 256 -performance_schema (pfs_account).row_count 100 -performance_schema (pfs_account).memory 25600 -performance_schema events_waits_summary_by_account_by_event_name.row_size 32 -performance_schema events_waits_summary_by_account_by_event_name.row_count 38300 -performance_schema events_waits_summary_by_account_by_event_name.memory 1225600 -performance_schema events_waits_summary_by_user_by_event_name.row_size 32 -performance_schema events_waits_summary_by_user_by_event_name.row_count 38300 -performance_schema events_waits_summary_by_user_by_event_name.memory 1225600 -performance_schema events_waits_summary_by_host_by_event_name.row_size 32 -performance_schema events_waits_summary_by_host_by_event_name.row_count 38300 -performance_schema events_waits_summary_by_host_by_event_name.memory 1225600 -performance_schema (pfs_user).row_size 128 -performance_schema (pfs_user).row_count 100 -performance_schema (pfs_user).memory 12800 -performance_schema (pfs_host).row_size 128 -performance_schema (pfs_host).row_count 100 -performance_schema (pfs_host).memory 12800 -performance_schema (pfs_stage_class).row_size 256 -performance_schema (pfs_stage_class).row_count 150 -performance_schema (pfs_stage_class).memory 38400 -performance_schema events_stages_history.row_size 88 -performance_schema events_stages_history.row_count 2890 -performance_schema events_stages_history.memory 254320 -performance_schema events_stages_history_long.row_size 88 -performance_schema events_stages_history_long.row_count 1000 -performance_schema events_stages_history_long.memory 88000 -performance_schema events_stages_summary_by_thread_by_event_name.row_size 32 -performance_schema events_stages_summary_by_thread_by_event_name.row_count 43350 -performance_schema events_stages_summary_by_thread_by_event_name.memory 1387200 -performance_schema events_stages_summary_global_by_event_name.row_size 32 -performance_schema events_stages_summary_global_by_event_name.row_count 150 -performance_schema events_stages_summary_global_by_event_name.memory 4800 -performance_schema events_stages_summary_by_account_by_event_name.row_size 32 -performance_schema events_stages_summary_by_account_by_event_name.row_count 15000 -performance_schema events_stages_summary_by_account_by_event_name.memory 480000 -performance_schema events_stages_summary_by_user_by_event_name.row_size 32 -performance_schema events_stages_summary_by_user_by_event_name.row_count 15000 -performance_schema events_stages_summary_by_user_by_event_name.memory 480000 -performance_schema events_stages_summary_by_host_by_event_name.row_size 32 -performance_schema events_stages_summary_by_host_by_event_name.row_count 15000 -performance_schema events_stages_summary_by_host_by_event_name.memory 480000 -performance_schema (pfs_statement_class).row_size 192 -performance_schema (pfs_statement_class).row_count 168 -performance_schema (pfs_statement_class).memory 32256 -performance_schema events_statements_history.row_size 3024 -performance_schema events_statements_history.row_count 2890 -performance_schema events_statements_history.memory 8739360 -performance_schema events_statements_history_long.row_size 3024 -performance_schema events_statements_history_long.row_count 1000 -performance_schema events_statements_history_long.memory 3024000 -performance_schema events_statements_summary_by_thread_by_event_name.row_size 184 -performance_schema events_statements_summary_by_thread_by_event_name.row_count 48552 -performance_schema events_statements_summary_by_thread_by_event_name.memory 8933568 -performance_schema events_statements_summary_global_by_event_name.row_size 184 -performance_schema events_statements_summary_global_by_event_name.row_count 168 -performance_schema events_statements_summary_global_by_event_name.memory 30912 -performance_schema events_statements_summary_by_account_by_event_name.row_size 184 -performance_schema events_statements_summary_by_account_by_event_name.row_count 16800 -performance_schema events_statements_summary_by_account_by_event_name.memory 3091200 -performance_schema events_statements_summary_by_user_by_event_name.row_size 184 -performance_schema events_statements_summary_by_user_by_event_name.row_count 16800 -performance_schema events_statements_summary_by_user_by_event_name.memory 3091200 -performance_schema events_statements_summary_by_host_by_event_name.row_size 184 -performance_schema events_statements_summary_by_host_by_event_name.row_count 16800 -performance_schema events_statements_summary_by_host_by_event_name.memory 3091200 -performance_schema events_statements_current.row_size 3024 -performance_schema events_statements_current.row_count 289 -performance_schema events_statements_current.memory 873936 -performance_schema (pfs_socket_class).row_size 320 -performance_schema (pfs_socket_class).row_count 10 -performance_schema (pfs_socket_class).memory 3200 -performance_schema socket_instances.row_size 320 -performance_schema socket_instances.row_count 232 -performance_schema socket_instances.memory 74240 -performance_schema events_statements_summary_by_digest.row_size 1472 -performance_schema events_statements_summary_by_digest.row_count 5000 -performance_schema events_statements_summary_by_digest.memory 7360000 -performance_schema session_connect_attrs.row_size 289 -performance_schema session_connect_attrs.row_count 512 -performance_schema session_connect_attrs.memory 147968 -performance_schema (account_hash).count 2 -performance_schema (account_hash).size 100 -performance_schema (digest_hash).count 0 -performance_schema (digest_hash).size 5000 -performance_schema (filename_hash).count 0 -performance_schema (filename_hash).size 1754 -performance_schema (host_hash).count 2 -performance_schema (host_hash).size 100 -performance_schema (setup_actor_hash).count 1 -performance_schema (setup_actor_hash).size 100 -performance_schema (setup_object_hash).count 4 -performance_schema (setup_object_hash).size 100 -performance_schema (table_share_hash).count 80 -performance_schema (table_share_hash).size 556 -performance_schema (user_hash).count 2 -performance_schema (user_hash).size 100 -performance_schema host_cache.size 336 -performance_schema performance_schema.memory 70954032 diff --git a/mysql-test/suite/perfschema/r/sizing_off.result b/mysql-test/suite/perfschema/r/sizing_off.result index 0d95a8c0f1b..614ad7d2475 100644 --- a/mysql-test/suite/perfschema/r/sizing_off.result +++ b/mysql-test/suite/perfschema/r/sizing_off.result @@ -1,4 +1,6 @@ -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema OFF performance_schema_accounts_size -1 @@ -22,7 +24,6 @@ performance_schema_max_rwlock_instances -1 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances -1 performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 168 performance_schema_max_table_handles -1 performance_schema_max_table_instances -1 performance_schema_max_thread_classes 50 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 b27ecd52226..9e0b9209b89 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_idle.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_idle.result @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_disable_stages.result b/mysql-test/suite/perfschema/r/start_server_disable_stages.result index 0b8e00a5653..99b18e851a4 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_stages.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_stages.result @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_disable_statements.result b/mysql-test/suite/perfschema/r/start_server_disable_statements.result index 8e8d1498b9f..5217f16a32f 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_statements.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_statements.result @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_disable_waits.result b/mysql-test/suite/perfschema/r/start_server_disable_waits.result index d4b02dedc2c..86c25348cd5 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_waits.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_waits.result @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_innodb.result b/mysql-test/suite/perfschema/r/start_server_innodb.result index 0d7ea7d6294..d03c20a5878 100644 --- a/mysql-test/suite/perfschema/r/start_server_innodb.result +++ b/mysql-test/suite/perfschema/r/start_server_innodb.result @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_low_digest.result b/mysql-test/suite/perfschema/r/start_server_low_digest.result new file mode 100644 index 00000000000..aff444250e0 --- /dev/null +++ b/mysql-test/suite/perfschema/r/start_server_low_digest.result @@ -0,0 +1,12 @@ +USE performance_schema; +truncate table events_statements_history_long; +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+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; +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+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 +74 +#################################### +# QUERYING PS STATEMENT DIGEST +#################################### +SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long; +event_name digest digest_text sql_text +statement/sql/truncate e1c917a43f978456fab15240f89372ca TRUNCATE TABLE truncate table events_statements_history_long +statement/sql/select 4cc1c447d79877c4e8df0423fd0cde9a SELECT ? + ? + 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+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 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 b9ec719ed58..3e0324868a7 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_account.result +++ b/mysql-test/suite/perfschema/r/start_server_no_account.result @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 0 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result index 4fac77bc0cc..158dfb81ebe 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result index 75cd54776eb..3673600a078 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_class.result b/mysql-test/suite/perfschema/r/start_server_no_file_class.result index 9922fcaa016..1e819d26265 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result index 6e8735f6a1f..b439af66f8d 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_host.result b/mysql-test/suite/perfschema/r/start_server_no_host.result index f5dae7c61d9..abb8a157ec6 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_host.result +++ b/mysql-test/suite/perfschema/r/start_server_no_host.result @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result index 4b3c8790b58..c5fe555b749 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result index 92ec4cf61fc..d88d808a9ab 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result index e4ac0d0fa8b..1155993e60c 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result index 3bba543f3b8..4d419817b0a 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result index 2c3ef382fb9..281ca17491c 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result index 0b49b4d055a..1e5578daddc 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result index 9cf73c2b78d..ef1050d9fde 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result index 6da66d6ee75..97cbc807f3c 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result index 532935bb0ff..a173447632d 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result index 360571bc326..6de6cc3187e 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result index d458e3da9b1..fc0e680ebb7 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result index 78fe9223ef4..fca5ab82238 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 0 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 2682ea22f88..1fc13bf6ce3 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result index 9568e9ad56b..d51d3acf343 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result index c189d9a5024..784ed74e33c 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 0 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result index a440cfe3302..da73df5c419 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 0 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result index d9c945ea8cb..a84f0f3c0ef 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 0 diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result index f5ce5bebb51..3be29053b33 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_user.result b/mysql-test/suite/perfschema/r/start_server_no_user.result index 53cb0051f97..d80a9a4a2c4 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_user.result +++ b/mysql-test/suite/perfschema/r/start_server_no_user.result @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result index 125274550eb..928307123d8 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result index 50212863574..d8ada5f9da5 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 @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_nothing.result b/mysql-test/suite/perfschema/r/start_server_nothing.result index 4e6994d670e..bf84848641c 100644 --- a/mysql-test/suite/perfschema/r/start_server_nothing.result +++ b/mysql-test/suite/perfschema/r/start_server_nothing.result @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 0 @@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances 0 performance_schema_max_socket_classes 0 performance_schema_max_socket_instances 0 performance_schema_max_stage_classes 0 -performance_schema_max_statement_classes 0 performance_schema_max_table_handles 0 performance_schema_max_table_instances 0 performance_schema_max_thread_classes 0 diff --git a/mysql-test/suite/perfschema/r/start_server_off.result b/mysql-test/suite/perfschema/r/start_server_off.result index 08847829579..293607c41e9 100644 --- a/mysql-test/suite/perfschema/r/start_server_off.result +++ b/mysql-test/suite/perfschema/r/start_server_off.result @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema OFF performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_on.result b/mysql-test/suite/perfschema/r/start_server_on.result index 0d7ea7d6294..d03c20a5878 100644 --- a/mysql-test/suite/perfschema/r/start_server_on.result +++ b/mysql-test/suite/perfschema/r/start_server_on.result @@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table; select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -93,7 +95,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/statement_digest.result b/mysql-test/suite/perfschema/r/statement_digest.result index 41cba435cb6..e3df74a70d9 100644 --- a/mysql-test/suite/perfschema/r/statement_digest.result +++ b/mysql-test/suite/perfschema/r/statement_digest.result @@ -112,43 +112,42 @@ DROP TRIGGER trg; SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS -statements_digest 0e98ee6a98e296530ec59c12dbc08dfe TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 -statements_digest 954f43425c3234acc8e194afd97e8a0a SELECT ? FROM t1 1 0 0 0 -statements_digest fc365a54bc19d746bd24c27aba46b990 SELECT ? FROM `t1` 1 0 0 0 -statements_digest 27ba28f6252e4ae0e9b14b36da536fbe SELECT ?, ... FROM t1 2 0 0 0 -statements_digest 81d03922612900032ec4b81934ab4841 SELECT ? FROM t2 1 0 0 0 -statements_digest adce8aec12b6b5046cd4bf55951014c7 SELECT ?, ... FROM t2 2 0 0 0 -statements_digest 59a1bd93c424b10802fe66bb6dcd94d2 INSERT INTO t1 VALUES (?) 1 1 0 0 -statements_digest 91b2da58b0eb49c35a38fbc49f5e491d INSERT INTO t2 VALUES (?) 1 1 0 0 -statements_digest 967114adbf91d8a4a99ec5e49e909ff4 INSERT INTO t3 VALUES (...) 4 4 0 0 -statements_digest 8f25e7a48487e0aa7377e816816bb658 INSERT INTO t4 VALUES (...) 1 1 0 0 -statements_digest 4e51253af793867fba66166de1f314f7 INSERT INTO t5 VALUES (...) 1 1 0 0 -statements_digest fa47b3109e117216cd10209690d28596 INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0 -statements_digest 72409f84bc236e6fe9f2f7b4d727f2d3 INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0 -statements_digest d40aaddb41ed794d65dd8273f0c75700 INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0 -statements_digest 57a82b28388e52e99fc64339dd30edde INSERT INTO t1 VALUES ( NULL ) 1 1 0 0 -statements_digest 6a56b694106442474cb0e5fb7575c8b9 INSERT INTO t6 VALUES (...) 5 5 0 0 -statements_digest c9abf55e296c4317dbaf2d14ef907ad7 SELECT ? + ? 3 0 0 0 -statements_digest 156304a0851a3e3626b39fb3da841a82 SELECT ? 1 0 0 0 +statements_digest 8de787d0e3e3a062aea121ff528fcfce TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 +statements_digest a871edd1a65606b404c0b6e65c1f142c SELECT ? FROM t1 1 0 0 0 +statements_digest d60830f376a7724280dfc422224bb475 SELECT ? FROM `t1` 1 0 0 0 +statements_digest 09309c60c199a727b7ebed40975e8764 SELECT ?, ... FROM t1 2 0 0 0 +statements_digest dc0dcaefa9a12455ffed04ac6f89e65d SELECT ? FROM t2 1 0 0 0 +statements_digest d274a288509eae2cd7febf2f7fe36274 SELECT ?, ... FROM t2 2 0 0 0 +statements_digest ec913f89e0d8be99014bf78e73228c48 INSERT INTO t1 VALUES (?) 2 2 0 0 +statements_digest b919ecf2d5544bcdf95e76eb22231c42 INSERT INTO t2 VALUES (?) 1 1 0 0 +statements_digest d9030eddb8dca8ee5fcaf79e6f254b41 INSERT INTO t3 VALUES (...) 4 4 0 0 +statements_digest 2ad6d8279781b0fb40bdc8647dc94216 INSERT INTO t4 VALUES (...) 1 1 0 0 +statements_digest 3248c16dc70111225fcffa99641e312b INSERT INTO t5 VALUES (...) 1 1 0 0 +statements_digest 152b6c84a0cbfadcbecde01050eddd66 INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0 +statements_digest c4cbce33b636e448c29e041b1d5c0eb1 INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0 +statements_digest 0bfac9fb577995b116e52ff4aaeaa5b8 INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0 +statements_digest 819acce11785e12f2f73964115632db6 INSERT INTO t6 VALUES (...) 5 5 0 0 +statements_digest aeb185ab9b6e9d5a49e47c8741b8acdf SELECT ? + ? 3 0 0 0 +statements_digest d3804664eeee11407f3fcbd5c29a1f73 SELECT ? 1 0 0 0 statements_digest 3b085ab0d2063dfca1a39212e3ea1831 CREATE SCHEMA statements_digest_temp 2 2 0 0 statements_digest 09f9fabef2feb9a54ba01455e5ae83b9 DROP SCHEMA statements_digest_temp 2 0 0 0 -statements_digest 7910a63ffd31cbcb742e15270c8958c8 SELECT ? FROM no_such_table 1 0 0 1 -statements_digest fa34540a438bc672478b1162505ee28c CREATE TABLE dup_table ( c CHARACTER (?) ) 2 0 0 1 -statements_digest 2c720f176bb7c8510ff8aca8921b9945 DROP TABLE dup_table 1 0 0 0 -statements_digest 0c7d9fd8c27ab067511da41ca3bcdff3 INSERT INTO t11 VALUES (?) 1 1 1 0 -statements_digest 81681ff345065ed72bcd1e9407ab85e4 SHOW WARNINGS 1 0 0 0 -statements_digest d766f5823ae5d8e4cf4602b8e7a3fb80 PREPARE stmt FROM ? 1 0 0 0 +statements_digest ff0bb1dfc399aa3bef6a0f3fccd3ef94 SELECT ? FROM no_such_table 1 0 0 1 +statements_digest 590a245c84e63eb100e1ef463f477f1a CREATE TABLE dup_table ( c CHARACTER (?) ) 2 0 0 1 +statements_digest 74078b0776d8333e356b271551587d53 DROP TABLE dup_table 1 0 0 0 +statements_digest f23641c5ab7e1dd6e0146f66b3fff5c4 INSERT INTO t11 VALUES (?) 1 1 1 0 +statements_digest d3eda26b379bd56340ce84fe395dfff7 SHOW WARNINGS 1 0 0 0 +statements_digest 6bb42dec3094486d5a9e8b0bf460e382 PREPARE stmt FROM ? 1 0 0 0 statements_digest 3ab1e87eabd9688edf919754cce6348b EXECUTE stmt 2 0 0 0 -statements_digest 470094469d250b9f45cab45bf610efe8 DEALLOCATE PREPARE stmt 1 0 0 0 -statements_digest 1b4d25358e08b35ad54e49dfe5eaf3e4 CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 1 0 0 0 +statements_digest f9438ab7b8eec604338c28a04e5d650f DEALLOCATE PREPARE stmt 1 0 0 0 +statements_digest 072d6c57d3fe4f0c6a7dabba96f0ccf8 CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 1 0 0 0 statements_digest 84554971243e91106214dcb8f4eaa89b CALL p1 ( ) 2 0 0 0 -statements_digest 77206e4bf30979c56752a7ed9150213a DROP PROCEDURE p1 1 0 0 0 -statements_digest 03b91dcdba6b0e29f7fb240ae4bcd97f CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 1 0 0 0 -statements_digest 72bc532f308f2dca62f5291df8c50e6f SELECT func (...) 2 0 0 0 +statements_digest 2bd1e1e6eb445f32e1d4b290c1961e6b DROP PROCEDURE p1 1 0 0 0 +statements_digest 5799522044ce9a4fa48dce5f4a3b047a CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 1 0 0 0 +statements_digest 59cbdd7ffc78a23bc2f650f8158067c6 SELECT func (...) 2 0 0 0 statements_digest 0b5a5297689c5036def6af8e8a8ce113 DROP FUNCTION func 1 0 0 0 -statements_digest d08331e42c67555ece50e46eef0f2b47 CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @ ? := ? 1 0 0 0 -statements_digest 754a49a4de995c5a729e9ab52f135f59 INSERT INTO t12 VALUES (?) 2 2 0 0 -statements_digest 68df17752bca7c2c8ee2a6a19a0674e7 DROP TRIGGER trg 1 0 0 0 +statements_digest 10c7a2262748aa15496375d99f876fb2 CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @? := ? 1 0 0 0 +statements_digest bb0154f3d32233f696b95d4127d29a3b INSERT INTO t12 VALUES (?) 2 2 0 0 +statements_digest a975545baf024e8a173be77032d8fd01 DROP TRIGGER trg 1 0 0 0 #################################### # CLEANUP #################################### diff --git a/mysql-test/suite/perfschema/r/statement_digest_consumers.result b/mysql-test/suite/perfschema/r/statement_digest_consumers.result index 21e62e13b19..355905f71d8 100644 --- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result +++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result @@ -125,43 +125,42 @@ DROP TRIGGER trg; #################################### SELECT schema_name, digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest; schema_name digest digest_text count_star -statements_digest 0e98ee6a98e296530ec59c12dbc08dfe TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 -statements_digest 954f43425c3234acc8e194afd97e8a0a SELECT ? FROM t1 1 -statements_digest fc365a54bc19d746bd24c27aba46b990 SELECT ? FROM `t1` 1 -statements_digest 27ba28f6252e4ae0e9b14b36da536fbe SELECT ?, ... FROM t1 2 -statements_digest 81d03922612900032ec4b81934ab4841 SELECT ? FROM t2 1 -statements_digest adce8aec12b6b5046cd4bf55951014c7 SELECT ?, ... FROM t2 2 -statements_digest 59a1bd93c424b10802fe66bb6dcd94d2 INSERT INTO t1 VALUES (?) 1 -statements_digest 91b2da58b0eb49c35a38fbc49f5e491d INSERT INTO t2 VALUES (?) 1 -statements_digest 967114adbf91d8a4a99ec5e49e909ff4 INSERT INTO t3 VALUES (...) 4 -statements_digest 8f25e7a48487e0aa7377e816816bb658 INSERT INTO t4 VALUES (...) 1 -statements_digest 4e51253af793867fba66166de1f314f7 INSERT INTO t5 VALUES (...) 1 -statements_digest fa47b3109e117216cd10209690d28596 INSERT INTO t1 VALUES (?) /* , ... */ 2 -statements_digest 72409f84bc236e6fe9f2f7b4d727f2d3 INSERT INTO t3 VALUES (...) /* , ... */ 1 -statements_digest d40aaddb41ed794d65dd8273f0c75700 INSERT INTO t5 VALUES (...) /* , ... */ 1 -statements_digest 57a82b28388e52e99fc64339dd30edde INSERT INTO t1 VALUES ( NULL ) 1 -statements_digest 6a56b694106442474cb0e5fb7575c8b9 INSERT INTO t6 VALUES (...) 5 -statements_digest c9abf55e296c4317dbaf2d14ef907ad7 SELECT ? + ? 3 -statements_digest 156304a0851a3e3626b39fb3da841a82 SELECT ? 1 +statements_digest 8de787d0e3e3a062aea121ff528fcfce TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 +statements_digest a871edd1a65606b404c0b6e65c1f142c SELECT ? FROM t1 1 +statements_digest d60830f376a7724280dfc422224bb475 SELECT ? FROM `t1` 1 +statements_digest 09309c60c199a727b7ebed40975e8764 SELECT ?, ... FROM t1 2 +statements_digest dc0dcaefa9a12455ffed04ac6f89e65d SELECT ? FROM t2 1 +statements_digest d274a288509eae2cd7febf2f7fe36274 SELECT ?, ... FROM t2 2 +statements_digest ec913f89e0d8be99014bf78e73228c48 INSERT INTO t1 VALUES (?) 2 +statements_digest b919ecf2d5544bcdf95e76eb22231c42 INSERT INTO t2 VALUES (?) 1 +statements_digest d9030eddb8dca8ee5fcaf79e6f254b41 INSERT INTO t3 VALUES (...) 4 +statements_digest 2ad6d8279781b0fb40bdc8647dc94216 INSERT INTO t4 VALUES (...) 1 +statements_digest 3248c16dc70111225fcffa99641e312b INSERT INTO t5 VALUES (...) 1 +statements_digest 152b6c84a0cbfadcbecde01050eddd66 INSERT INTO t1 VALUES (?) /* , ... */ 2 +statements_digest c4cbce33b636e448c29e041b1d5c0eb1 INSERT INTO t3 VALUES (...) /* , ... */ 1 +statements_digest 0bfac9fb577995b116e52ff4aaeaa5b8 INSERT INTO t5 VALUES (...) /* , ... */ 1 +statements_digest 819acce11785e12f2f73964115632db6 INSERT INTO t6 VALUES (...) 5 +statements_digest aeb185ab9b6e9d5a49e47c8741b8acdf SELECT ? + ? 3 +statements_digest d3804664eeee11407f3fcbd5c29a1f73 SELECT ? 1 statements_digest 3b085ab0d2063dfca1a39212e3ea1831 CREATE SCHEMA statements_digest_temp 2 statements_digest 09f9fabef2feb9a54ba01455e5ae83b9 DROP SCHEMA statements_digest_temp 2 -statements_digest 7910a63ffd31cbcb742e15270c8958c8 SELECT ? FROM no_such_table 1 -statements_digest fa34540a438bc672478b1162505ee28c CREATE TABLE dup_table ( c CHARACTER (?) ) 2 -statements_digest 2c720f176bb7c8510ff8aca8921b9945 DROP TABLE dup_table 1 -statements_digest 0c7d9fd8c27ab067511da41ca3bcdff3 INSERT INTO t11 VALUES (?) 1 -statements_digest 81681ff345065ed72bcd1e9407ab85e4 SHOW WARNINGS 1 -statements_digest d766f5823ae5d8e4cf4602b8e7a3fb80 PREPARE stmt FROM ? 1 +statements_digest ff0bb1dfc399aa3bef6a0f3fccd3ef94 SELECT ? FROM no_such_table 1 +statements_digest 590a245c84e63eb100e1ef463f477f1a CREATE TABLE dup_table ( c CHARACTER (?) ) 2 +statements_digest 74078b0776d8333e356b271551587d53 DROP TABLE dup_table 1 +statements_digest f23641c5ab7e1dd6e0146f66b3fff5c4 INSERT INTO t11 VALUES (?) 1 +statements_digest d3eda26b379bd56340ce84fe395dfff7 SHOW WARNINGS 1 +statements_digest 6bb42dec3094486d5a9e8b0bf460e382 PREPARE stmt FROM ? 1 statements_digest 3ab1e87eabd9688edf919754cce6348b EXECUTE stmt 2 -statements_digest 470094469d250b9f45cab45bf610efe8 DEALLOCATE PREPARE stmt 1 -statements_digest 1b4d25358e08b35ad54e49dfe5eaf3e4 CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 1 +statements_digest f9438ab7b8eec604338c28a04e5d650f DEALLOCATE PREPARE stmt 1 +statements_digest 072d6c57d3fe4f0c6a7dabba96f0ccf8 CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 1 statements_digest 84554971243e91106214dcb8f4eaa89b CALL p1 ( ) 2 -statements_digest 77206e4bf30979c56752a7ed9150213a DROP PROCEDURE p1 1 -statements_digest 03b91dcdba6b0e29f7fb240ae4bcd97f CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 1 -statements_digest 72bc532f308f2dca62f5291df8c50e6f SELECT func (...) 2 +statements_digest 2bd1e1e6eb445f32e1d4b290c1961e6b DROP PROCEDURE p1 1 +statements_digest 5799522044ce9a4fa48dce5f4a3b047a CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 1 +statements_digest 59cbdd7ffc78a23bc2f650f8158067c6 SELECT func (...) 2 statements_digest 0b5a5297689c5036def6af8e8a8ce113 DROP FUNCTION func 1 -statements_digest d08331e42c67555ece50e46eef0f2b47 CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @ ? := ? 1 -statements_digest 754a49a4de995c5a729e9ab52f135f59 INSERT INTO t12 VALUES (?) 2 -statements_digest 68df17752bca7c2c8ee2a6a19a0674e7 DROP TRIGGER trg 1 +statements_digest 10c7a2262748aa15496375d99f876fb2 CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @? := ? 1 +statements_digest bb0154f3d32233f696b95d4127d29a3b INSERT INTO t12 VALUES (?) 2 +statements_digest a975545baf024e8a173be77032d8fd01 DROP TRIGGER trg 1 SELECT digest, digest_text FROM performance_schema.events_statements_current; digest digest_text #################################### diff --git a/mysql-test/suite/perfschema/r/statement_digest_long_query.result b/mysql-test/suite/perfschema/r/statement_digest_long_query.result index bb355304537..f9943060c83 100644 --- a/mysql-test/suite/perfschema/r/statement_digest_long_query.result +++ b/mysql-test/suite/perfschema/r/statement_digest_long_query.result @@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1 #################################### SELECT schema_name, digest, digest_text, count_star FROM events_statements_summary_by_digest; schema_name digest digest_text count_star -performance_schema 9d35ff74210c6b30efa4559d627ed0f7 TRUNCATE TABLE events_statements_summary_by_digest 1 -performance_schema d78a04c1c42765b8552e0483c50ae9ff SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ... 1 +performance_schema 7536ab4a65b991a0b1a8b9851e8457c3 TRUNCATE TABLE events_statements_summary_by_digest 1 +performance_schema 63f9aaeed7859671c6a42c75fcd43785 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 ea2980e5755..2613737a3da 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 @@ -39,7 +39,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -63,7 +65,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result index f51e8383019..e5aaf207820 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 @@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -62,7 +64,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result index a7844b6b0e6..637d923ebdb 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 @@ -39,7 +39,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -63,7 +65,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result index 4d089c810a1..a41ae765a77 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 @@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -62,7 +64,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result index 23bd1294445..2278744621e 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 @@ -37,7 +37,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -61,7 +63,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result index 7edfc3824bb..b3ada0d638a 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 @@ -36,7 +36,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -60,7 +62,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result index 99d2e7d4655..361a8a700d0 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 @@ -37,7 +37,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -61,7 +63,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result index f8c660bd932..97bb0e34e0d 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 @@ -36,7 +36,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -60,7 +62,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_off.result b/mysql-test/suite/perfschema/r/table_aggregate_off.result index 73ed3550a77..f28f374c5dd 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_off.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_off.result @@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -62,7 +64,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result index 3906c6f6b84..f7760043ddd 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 @@ -39,7 +39,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -63,7 +65,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result index 0b579f54a66..0ee5eaddcaf 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 @@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -62,7 +64,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result index e137525e5b0..025a7f27738 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 @@ -39,7 +39,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -63,7 +65,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result index 799555b685e..f655cd5bb93 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 @@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -62,7 +64,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result index bf920a30af3..55bb5a6a71f 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 @@ -41,7 +41,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -65,7 +67,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result index d100f2a5e08..7f9f9e99359 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 @@ -40,7 +40,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -64,7 +66,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result index a5d046f154c..7aa15b6a01d 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 @@ -41,7 +41,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -65,7 +67,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result index 413a566fefb..0732fce5853 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 @@ -40,7 +40,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -64,7 +66,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result index 4a5e7aeede1..c1f6fd56a97 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 @@ -39,7 +39,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -63,7 +65,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result index 25ba676993a..705e6ca7021 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 @@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -62,7 +64,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result index 41292e5913e..04b7c7979c4 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 @@ -39,7 +39,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -63,7 +65,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result index fc7c523ed8c..ef1f31b19a4 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 @@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -62,7 +64,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result index 210928a0c04..a7ac4fa860f 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 @@ -41,7 +41,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -65,7 +67,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result index 9df65066d45..28bdcfb1d82 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 @@ -40,7 +40,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -64,7 +66,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result index a9109fa42d2..683dd9cc4a6 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 @@ -41,7 +41,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -65,7 +67,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result index 542b020f77a..d488066dd7f 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 @@ -40,7 +40,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -64,7 +66,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result index ece0dadebd0..d3a4416fdfd 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 @@ -41,7 +41,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -65,7 +67,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result index 956540b9327..c69fc8a37d3 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 @@ -40,7 +40,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -64,7 +66,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result index 72f0240c6be..91110a94be5 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 @@ -41,7 +41,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -65,7 +67,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result index a93cc1b6499..b443ac28c17 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 @@ -40,7 +40,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -64,7 +66,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result index 0e1b7032af6..08a107acb2a 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 @@ -39,7 +39,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -63,7 +65,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result index fb1fd8fb207..07272c6e204 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 @@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -62,7 +64,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result index f97272634b9..77c52780ae9 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 @@ -39,7 +39,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -63,7 +65,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result index ddf8ef7bf9d..6d7192285e3 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 @@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -62,7 +64,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result index 588a378024a..160be444e7c 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 @@ -41,7 +41,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -65,7 +67,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result index 76c466d48cc..e915a8dfa95 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 @@ -40,7 +40,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -64,7 +66,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result index 2450456355a..82c1b65acff 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 @@ -41,7 +41,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -65,7 +67,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result index 72b46a2820b..9023a4b0a69 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 @@ -40,7 +40,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 @@ -64,7 +66,6 @@ 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 180 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/threads_mysql.result b/mysql-test/suite/perfschema/r/threads_mysql.result index 4da857f83fc..6ab0b0641b0 100644 --- a/mysql-test/suite/perfschema/r/threads_mysql.result +++ b/mysql-test/suite/perfschema/r/threads_mysql.result @@ -13,7 +13,7 @@ processlist_user NULL processlist_host NULL processlist_db NULL processlist_command NULL -processlist_info INTERNAL DDL LOG RECOVER IN PROGRESS +processlist_info NULL unified_parent_thread_id NULL role NULL instrumented YES diff --git a/mysql-test/suite/perfschema/t/aggregate.test b/mysql-test/suite/perfschema/t/aggregate.test index 672737ae2a7..fe30a7b8697 100644 --- a/mysql-test/suite/perfschema/t/aggregate.test +++ b/mysql-test/suite/perfschema/t/aggregate.test @@ -6,6 +6,10 @@ --echo "General cleanup" +# MDEV-7187 - test fails sporadically in buildbot +set @aria_checkpoint_interval_save= @@global.aria_checkpoint_interval; +set @@global.aria_checkpoint_interval= 0; + --disable_warnings drop table if exists t1; --enable_warnings @@ -188,3 +192,6 @@ update performance_schema.setup_instruments set enabled = 'YES', timed = 'YES'; drop table test.t1; + +set @@global.aria_checkpoint_interval= @aria_checkpoint_interval_save; + diff --git a/mysql-test/suite/perfschema/t/digest_null_literal.test b/mysql-test/suite/perfschema/t/digest_null_literal.test new file mode 100644 index 00000000000..91f1eec1f95 --- /dev/null +++ b/mysql-test/suite/perfschema/t/digest_null_literal.test @@ -0,0 +1,32 @@ +# ---------------------------------------------------- +# Tests for the performance schema statement Digests. +# ---------------------------------------------------- + +# Test case to show behavior of statements digest when +# parsing a NULL literal + +--source include/not_embedded.inc +--source include/have_perfschema.inc +--source include/no_protocol.inc + +TRUNCATE TABLE performance_schema.events_statements_summary_by_digest; + +--disable_query_log + +select NULL; +select NULL FROM DUAL; +select NULL, NULL; +select NULL, NULL, NULL, 1, 2, 3, NULL, NULL; + +select 1 IS NULL; +select 2 IS NOT NULL; +select 1 IS NULL, 2 IS NULL, 3 IS NOT NULL, 4 IS NOT NULL; + +create table foo (a int DEFAULT NULL, b int NOT NULL DEFAULT 1, c int NOT NULL); +drop table foo; + +--enable_query_log + +SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR + FROM performance_schema.events_statements_summary_by_digest; + diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test index ae58f4089ed..c1af8516b79 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test @@ -8,7 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved: diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test index 8c408b160a6..a5ac18a8818 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test @@ -8,7 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved: diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test index ccd0ae383ee..ae1de4f032e 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test @@ -8,7 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc # [Warning] Hostname 'santa.claus.ipv6.example.com' does not resolve to '2001:db8::6:6'. diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test index 72d5d693a1b..361a3ce6bd1 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test @@ -8,7 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc # [Warning] Hostname 'santa.claus.ipv6.example.com' does not resolve to '2001:db8::6:6'. diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test index c253e4b77d5..9dbd682681e 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test @@ -8,7 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc # [Warning] IP address '192.0.2.4' could not be resolved: diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test index 096b4b11eb4..4836dfc2d36 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test @@ -8,7 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc # Enforce a clean state diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test index 575dab9a337..b675b5089a8 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test @@ -8,7 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved: diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test index f6e5fa118df..9ce4fb926e6 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test @@ -8,7 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved: diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test index 0e0e900405a..9c8168e573a 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test @@ -10,7 +10,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc --source include/have_plugin_auth.inc diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test index 9d4707dc027..cd78087dad1 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test @@ -10,7 +10,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc # Enforce a clean state diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test index d4adc3e0d00..0ced79544a3 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test @@ -10,7 +10,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc # Enforce a clean state diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test index e396dbbad3c..983a6e80ff7 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test @@ -8,7 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc # [Warning] IP address '2001:db8::6:6' could not be resolved: diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test index cc7eb0b566f..3cdd87e4cf9 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test @@ -8,7 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc # [Warning] IP address '2001:db8::6:6' could not be resolved: diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test index 80f07989212..3a30030413f 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test @@ -8,7 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc # [Warning] IP address '2001:db8::6:6' could not be resolved: diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test index 0d11e433b58..054940e4a02 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test @@ -8,7 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc # [Warning] IP address '2001:db8::6:6' could not be resolved: diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test index 6dd33b9bb5b..811c5c51c26 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test @@ -7,7 +7,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc # Enforce a clean state diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test index 2b30a4eaf41..c11922624c6 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test @@ -7,7 +7,7 @@ --source include/not_embedded.inc --source include/have_debug.inc ---source include/have_ipv6.inc +--source include/check_ipv6.inc --source include/have_perfschema.inc # Enforce a clean state diff --git a/mysql-test/suite/perfschema/t/nesting.test b/mysql-test/suite/perfschema/t/nesting.test index 21e7260222a..29819770645 100644 --- a/mysql-test/suite/perfschema/t/nesting.test +++ b/mysql-test/suite/perfschema/t/nesting.test @@ -5,7 +5,7 @@ # On windows, the socket instrumentation collects an extra "opt" # event, which changes the test output. --source include/not_windows.inc ---source ../include/no_protocol.inc +--source include/no_protocol.inc --source ../include/wait_for_pfs_thread_count.inc --disable_query_log diff --git a/mysql-test/suite/perfschema/t/ortho_iter.test b/mysql-test/suite/perfschema/t/ortho_iter.test index a9990e17409..0a90831ae70 100644 --- a/mysql-test/suite/perfschema/t/ortho_iter.test +++ b/mysql-test/suite/perfschema/t/ortho_iter.test @@ -126,8 +126,9 @@ $ delimiter ;$ # Check the configuration is ok -show variables like "performance_schema%"; -show status like "performance_schema%"; +show variables where + `Variable_name` != "performance_schema_max_statement_classes" and + `Variable_name` like "performance_schema%"; call check_instrument("wait/synch/mutex/"); call check_instrument("wait/synch/rwlock/"); diff --git a/mysql-test/suite/perfschema/t/privilege_table_io.test b/mysql-test/suite/perfschema/t/privilege_table_io.test index dc17fbcf67e..833fe85e8bb 100644 --- a/mysql-test/suite/perfschema/t/privilege_table_io.test +++ b/mysql-test/suite/perfschema/t/privilege_table_io.test @@ -36,7 +36,9 @@ insert into test.marker set a = 1; # This will not, the ACL cache is already loaded insert into test.marker set a = 1; insert into test.marker set a = 1; -show variables like "performance_schema%"; +show variables where + `Variable_name` != "performance_schema_max_statement_classes" and + `Variable_name` like "performance_schema%"; show status like "performance_schema%"; # Stop recording events + pull results let $schema_to_dump= "test", "mysql"; diff --git a/mysql-test/suite/perfschema/t/rpl_gtid_func.test b/mysql-test/suite/perfschema/t/rpl_gtid_func.test index 27837572bff..5a3fe0b7894 100644 --- a/mysql-test/suite/perfschema/t/rpl_gtid_func.test +++ b/mysql-test/suite/perfschema/t/rpl_gtid_func.test @@ -1,7 +1,7 @@ --source include/not_embedded.inc --source include/have_innodb.inc --source include/have_perfschema.inc ---source ../include/no_protocol.inc +--source include/no_protocol.inc -- source include/master-slave.inc diff --git a/mysql-test/suite/perfschema/t/rpl_statements.test b/mysql-test/suite/perfschema/t/rpl_statements.test index fa429cd2aa3..1aa52efd937 100644 --- a/mysql-test/suite/perfschema/t/rpl_statements.test +++ b/mysql-test/suite/perfschema/t/rpl_statements.test @@ -4,7 +4,7 @@ --source include/not_embedded.inc --source include/have_innodb.inc --source include/have_perfschema.inc ---source ../include/no_protocol.inc +--source include/no_protocol.inc --source include/have_binlog_format_mixed.inc --source include/master-slave.inc diff --git a/mysql-test/suite/perfschema/t/sizing_off.test b/mysql-test/suite/perfschema/t/sizing_off.test index 83b49572cb4..32729918bd1 100644 --- a/mysql-test/suite/perfschema/t/sizing_off.test +++ b/mysql-test/suite/perfschema/t/sizing_off.test @@ -2,5 +2,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc -show variables like "performance_schema%"; +show variables where + `Variable_name` != "performance_schema_max_statement_classes" and + `Variable_name` like "performance_schema%"; show status like "performance_schema%"; diff --git a/mysql-test/suite/perfschema/t/socket_instances_func-master.opt b/mysql-test/suite/perfschema/t/socket_instances_func-master.opt index ab6ca1731f5..b12a8b3b70e 100644 --- a/mysql-test/suite/perfschema/t/socket_instances_func-master.opt +++ b/mysql-test/suite/perfschema/t/socket_instances_func-master.opt @@ -1 +1 @@ ---skip-name-resolve +--skip-name-resolve --bind-address=* diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test b/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test index 5ba3af1e408..c6860eb3213 100644 --- a/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test +++ b/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test @@ -26,7 +26,7 @@ # happens per SQL statement within our MTR tests. And there is a significant # difference between standard statement execution and execution via # prepared statement. ---source ../include/no_protocol.inc +--source include/no_protocol.inc # Set this to enable debugging output let $my_socket_debug_dbug= 0; diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test index ef5096d85ff..d06edb0d78f 100644 --- a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test +++ b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test @@ -36,7 +36,7 @@ # happens per SQL statement within our MTR tests. And there is a significant # difference between standard statement execution and execution via # prepared statement. ---source ../include/no_protocol.inc +--source include/no_protocol.inc #=================================== diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test index 5d4b4209b6e..cefaf1de549 100644 --- a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test +++ b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test @@ -38,7 +38,7 @@ # happens per SQL statement within our MTR tests. And there is a significant # difference between standard statement execution and execution via # prepared statement. ---source ../include/no_protocol.inc +--source include/no_protocol.inc #=================================== diff --git a/mysql-test/suite/perfschema/t/start_server_low_digest-master.opt b/mysql-test/suite/perfschema/t/start_server_low_digest-master.opt new file mode 100644 index 00000000000..fc5065f9ae9 --- /dev/null +++ b/mysql-test/suite/perfschema/t/start_server_low_digest-master.opt @@ -0,0 +1 @@ +--max_digest_length=10 diff --git a/mysql-test/suite/perfschema/t/start_server_low_digest.test b/mysql-test/suite/perfschema/t/start_server_low_digest.test new file mode 100644 index 00000000000..6f06def169b --- /dev/null +++ b/mysql-test/suite/perfschema/t/start_server_low_digest.test @@ -0,0 +1,21 @@ +# ----------------------------------------------------------------------- +# Tests for the performance schema statement Digests. +# ----------------------------------------------------------------------- + +--source include/not_embedded.inc +--source include/have_perfschema.inc +--source include/no_protocol.inc + +USE performance_schema; +truncate table events_statements_history_long; + +# ----------------------------------------------------------------------- +# Test to show how the digest behaves with low value of +# - performance_schema_max_digest_length +# ----------------------------------------------------------------------- +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+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1; + +--echo #################################### +--echo # QUERYING PS STATEMENT DIGEST +--echo #################################### +SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long; diff --git a/mysql-test/suite/perfschema/t/statement_digest_long_query.test b/mysql-test/suite/perfschema/t/statement_digest_long_query.test index 3969383a6fb..b7ba18ef2cb 100644 --- a/mysql-test/suite/perfschema/t/statement_digest_long_query.test +++ b/mysql-test/suite/perfschema/t/statement_digest_long_query.test @@ -4,7 +4,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---source ../include/no_protocol.inc +--source include/no_protocol.inc USE performance_schema; truncate table events_statements_summary_by_digest; diff --git a/mysql-test/suite/perfschema/t/unary_digest.test b/mysql-test/suite/perfschema/t/unary_digest.test index c4583484f36..d8daea70d38 100644 --- a/mysql-test/suite/perfschema/t/unary_digest.test +++ b/mysql-test/suite/perfschema/t/unary_digest.test @@ -7,7 +7,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---source ../include/no_protocol.inc +--source include/no_protocol.inc TRUNCATE TABLE performance_schema.events_statements_summary_by_digest; |