From 7af733a5a2cb7f79ffb5ff0129cad6db6f3cc359 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 15 Feb 2020 18:25:57 +0100 Subject: perfschema compilation, test and misc fixes --- .../perfschema/r/start_server_no_thread_inst.result | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'mysql-test/suite/perfschema/r/start_server_no_thread_inst.result') 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 e71863fd67c..abedd06c0d9 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 @@ -4,7 +4,6 @@ information_schema mtr mysql performance_schema -sys test select count(*) from performance_schema.performance_timers; count(*) @@ -17,12 +16,9 @@ count(*) > 4 1 select count(*) from performance_schema.setup_timers; count(*) -<<<<<<< HEAD -4 -======= 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release. +Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; @@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; select * from performance_schema.replication_connection_configuration; -select * from performance_schema.replication_connection_status; select * from performance_schema.replication_applier_configuration; select * from performance_schema.replication_applier_status; select * from performance_schema.replication_applier_status_by_coordinator; -select * from performance_schema.replication_applier_status_by_worker; select * from performance_schema.global_status; select * from performance_schema.status_by_thread; select * from performance_schema.status_by_user; select * from performance_schema.status_by_host; select * from performance_schema.status_by_account; select * from performance_schema.session_status; -select * from performance_schema.global_variables; -select * from performance_schema.variables_by_thread; -select * from performance_schema.session_variables; show global variables like "performance_schema%"; Variable_name Value performance_schema ON @@ -124,7 +115,7 @@ performance_schema_events_transactions_history_size 10 performance_schema_events_waits_history_long_size 10000 performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 +performance_schema_max_cond_classes 90 performance_schema_max_cond_instances 1000 performance_schema_max_digest_length 1024 performance_schema_max_file_classes 80 @@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 performance_schema_max_sql_text_length 1024 -performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 193 +performance_schema_max_stage_classes 160 +performance_schema_max_statement_classes 222 performance_schema_max_statement_stack 10 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 @@ -154,7 +145,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 ->>>>>>> 258e16fa2de... WIP 5.7 P_S show engine PERFORMANCE_SCHEMA status; show global status like "performance_schema%"; show global variables like "performance_schema_max_thread_classes"; -- cgit v1.2.1