diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/start_server_nothing.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/start_server_nothing.result | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/mysql-test/suite/perfschema/r/start_server_nothing.result b/mysql-test/suite/perfschema/r/start_server_nothing.result index e22e507f391..5dcda26313a 100644 --- a/mysql-test/suite/perfschema/r/start_server_nothing.result +++ b/mysql-test/suite/perfschema/r/start_server_nothing.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 @@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size 0 performance_schema_setup_actors_size 0 performance_schema_setup_objects_size 0 performance_schema_users_size 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S show engine PERFORMANCE_SCHEMA status; show global status like "performance_schema%"; show global variables like "performance_schema%"; @@ -311,7 +301,7 @@ stage statement transaction 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; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS select * from performance_schema.cond_instances; |