diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r')
5 files changed, 97 insertions, 94 deletions
diff --git a/mysql-test/suite/perfschema/r/all_instances.result b/mysql-test/suite/perfschema/r/all_instances.result index 5f844e6dd3b..59b7232dc15 100644 --- a/mysql-test/suite/perfschema/r/all_instances.result +++ b/mysql-test/suite/perfschema/r/all_instances.result @@ -37,6 +37,7 @@ wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state wait/synch/mutex/sql/hash_filo::lock wait/synch/mutex/sql/LOCK_active_mi wait/synch/mutex/sql/LOCK_audit_mask +wait/synch/mutex/sql/LOCK_commit_ordered wait/synch/mutex/sql/LOCK_connection_count wait/synch/mutex/sql/LOCK_crypt wait/synch/mutex/sql/LOCK_delayed_create @@ -55,6 +56,7 @@ wait/synch/mutex/sql/LOCK_manager wait/synch/mutex/sql/LOCK_open wait/synch/mutex/sql/LOCK_plugin wait/synch/mutex/sql/LOCK_prepared_stmt_count +wait/synch/mutex/sql/LOCK_prepare_ordered wait/synch/mutex/sql/LOCK_rpl_status wait/synch/mutex/sql/LOCK_server_started wait/synch/mutex/sql/LOCK_slave_list @@ -63,7 +65,7 @@ wait/synch/mutex/sql/LOCK_status wait/synch/mutex/sql/LOCK_thread_count wait/synch/mutex/sql/LOCK_user_conn wait/synch/mutex/sql/LOCK_user_locks -wait/synch/mutex/sql/LOCK_uuid_generator +wait/synch/mutex/sql/LOCK_uuid_short_generator wait/synch/mutex/sql/LOCK_xid_cache wait/synch/mutex/sql/LOG::LOCK_log wait/synch/mutex/sql/LOG_INFO::lock @@ -80,6 +82,7 @@ wait/synch/mutex/sql/Relay_log_info::run_lock wait/synch/mutex/sql/Slave_reporting_capability::err_lock wait/synch/mutex/sql/TABLE_SHARE::LOCK_ha_data wait/synch/mutex/sql/THD::LOCK_thd_data +wait/synch/mutex/sql/THD::LOCK_wakeup_ready wait/synch/mutex/sql/tz_LOCK select name from rwlock_instances group by name; name @@ -127,6 +130,7 @@ wait/synch/cond/sql/Relay_log_info::data_cond wait/synch/cond/sql/Relay_log_info::log_space_cond wait/synch/cond/sql/Relay_log_info::start_cond wait/synch/cond/sql/Relay_log_info::stop_cond +wait/synch/cond/sql/THD::COND_wakeup_ready select event_name from file_instances group by event_name; event_name wait/io/file/aria/control diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result index fefc4f46061..9f48a085eca 100644 --- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result +++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result @@ -11,9 +11,9 @@ wait/synch/mutex/sql/hash_filo::lock YES YES wait/synch/mutex/sql/HA_DATA_PARTITION::LOCK_auto_inc YES YES wait/synch/mutex/sql/LOCK_active_mi YES YES wait/synch/mutex/sql/LOCK_audit_mask YES YES +wait/synch/mutex/sql/LOCK_commit_ordered YES YES wait/synch/mutex/sql/LOCK_connection_count YES YES wait/synch/mutex/sql/LOCK_crypt YES YES -wait/synch/mutex/sql/LOCK_delayed_create YES YES select * from performance_schema.setup_instruments where name like 'Wait/Synch/Rwlock/sql/%' and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock') diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade.result b/mysql-test/suite/perfschema/r/pfs_upgrade.result index c9347809157..b2e415637d9 100644 --- a/mysql-test/suite/perfschema/r/pfs_upgrade.result +++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result @@ -8,24 +8,24 @@ use performance_schema; show tables like "user_table"; Tables_in_performance_schema (user_table) user_table -ERROR 1050 (42S01) at line 181: Table 'cond_instances' already exists -ERROR 1050 (42S01) at line 211: Table 'events_waits_current' already exists -ERROR 1050 (42S01) at line 225: Table 'events_waits_history' already exists -ERROR 1050 (42S01) at line 239: Table 'events_waits_history_long' already exists -ERROR 1050 (42S01) at line 260: Table 'events_waits_summary_by_instance' already exists -ERROR 1050 (42S01) at line 281: Table 'events_waits_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 301: Table 'events_waits_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 318: Table 'file_instances' already exists -ERROR 1050 (42S01) at line 337: Table 'file_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 357: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 374: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 392: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 410: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 426: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 443: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 459: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 476: Table 'threads' already exists -ERROR 1644 (HY000) at line 1120: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 182: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line 212: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line 226: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line 240: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line 261: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line 282: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 302: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 319: Table 'file_instances' already exists +ERROR 1050 (42S01) at line 338: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 358: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line 375: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 393: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 411: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 427: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 444: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 460: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 477: Table 'threads' already exists +ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_table"; Tables_in_performance_schema (user_table) @@ -38,24 +38,24 @@ use performance_schema; show tables like "user_view"; Tables_in_performance_schema (user_view) user_view -ERROR 1050 (42S01) at line 181: Table 'cond_instances' already exists -ERROR 1050 (42S01) at line 211: Table 'events_waits_current' already exists -ERROR 1050 (42S01) at line 225: Table 'events_waits_history' already exists -ERROR 1050 (42S01) at line 239: Table 'events_waits_history_long' already exists -ERROR 1050 (42S01) at line 260: Table 'events_waits_summary_by_instance' already exists -ERROR 1050 (42S01) at line 281: Table 'events_waits_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 301: Table 'events_waits_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 318: Table 'file_instances' already exists -ERROR 1050 (42S01) at line 337: Table 'file_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 357: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 374: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 392: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 410: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 426: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 443: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 459: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 476: Table 'threads' already exists -ERROR 1644 (HY000) at line 1120: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 182: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line 212: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line 226: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line 240: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line 261: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line 282: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 302: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 319: Table 'file_instances' already exists +ERROR 1050 (42S01) at line 338: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 358: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line 375: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 393: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 411: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 427: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 444: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 460: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 477: Table 'threads' already exists +ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_view"; Tables_in_performance_schema (user_view) @@ -66,24 +66,24 @@ drop view test.user_view; create procedure test.user_proc() select "Not supposed to be here"; update mysql.proc set db='performance_schema' where name='user_proc'; -ERROR 1050 (42S01) at line 181: Table 'cond_instances' already exists -ERROR 1050 (42S01) at line 211: Table 'events_waits_current' already exists -ERROR 1050 (42S01) at line 225: Table 'events_waits_history' already exists -ERROR 1050 (42S01) at line 239: Table 'events_waits_history_long' already exists -ERROR 1050 (42S01) at line 260: Table 'events_waits_summary_by_instance' already exists -ERROR 1050 (42S01) at line 281: Table 'events_waits_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 301: Table 'events_waits_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 318: Table 'file_instances' already exists -ERROR 1050 (42S01) at line 337: Table 'file_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 357: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 374: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 392: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 410: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 426: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 443: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 459: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 476: Table 'threads' already exists -ERROR 1644 (HY000) at line 1120: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 182: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line 212: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line 226: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line 240: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line 261: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line 282: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 302: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 319: Table 'file_instances' already exists +ERROR 1050 (42S01) at line 338: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 358: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line 375: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 393: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 411: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 427: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 444: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 460: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 477: Table 'threads' already exists +ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -94,24 +94,24 @@ drop procedure test.user_proc; create function test.user_func() returns integer return 0; update mysql.proc set db='performance_schema' where name='user_func'; -ERROR 1050 (42S01) at line 181: Table 'cond_instances' already exists -ERROR 1050 (42S01) at line 211: Table 'events_waits_current' already exists -ERROR 1050 (42S01) at line 225: Table 'events_waits_history' already exists -ERROR 1050 (42S01) at line 239: Table 'events_waits_history_long' already exists -ERROR 1050 (42S01) at line 260: Table 'events_waits_summary_by_instance' already exists -ERROR 1050 (42S01) at line 281: Table 'events_waits_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 301: Table 'events_waits_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 318: Table 'file_instances' already exists -ERROR 1050 (42S01) at line 337: Table 'file_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 357: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 374: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 392: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 410: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 426: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 443: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 459: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 476: Table 'threads' already exists -ERROR 1644 (HY000) at line 1120: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 182: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line 212: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line 226: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line 240: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line 261: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line 282: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 302: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 319: Table 'file_instances' already exists +ERROR 1050 (42S01) at line 338: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 358: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line 375: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 393: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 411: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 427: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 444: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 460: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 477: Table 'threads' already exists +ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -122,24 +122,24 @@ drop function test.user_func; create event test.user_event on schedule every 1 day do select "not supposed to be here"; update mysql.event set db='performance_schema' where name='user_event'; -ERROR 1050 (42S01) at line 181: Table 'cond_instances' already exists -ERROR 1050 (42S01) at line 211: Table 'events_waits_current' already exists -ERROR 1050 (42S01) at line 225: Table 'events_waits_history' already exists -ERROR 1050 (42S01) at line 239: Table 'events_waits_history_long' already exists -ERROR 1050 (42S01) at line 260: Table 'events_waits_summary_by_instance' already exists -ERROR 1050 (42S01) at line 281: Table 'events_waits_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 301: Table 'events_waits_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 318: Table 'file_instances' already exists -ERROR 1050 (42S01) at line 337: Table 'file_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 357: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 374: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 392: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 410: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 426: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 443: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 459: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 476: Table 'threads' already exists -ERROR 1644 (HY000) at line 1120: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 182: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line 212: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line 226: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line 240: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line 261: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line 282: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 302: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 319: Table 'file_instances' already exists +ERROR 1050 (42S01) at line 338: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 358: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line 375: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 393: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 411: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 427: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 444: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 460: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 477: Table 'threads' already exists +ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.event where db='performance_schema'; name diff --git a/mysql-test/suite/perfschema/r/server_init.result b/mysql-test/suite/perfschema/r/server_init.result index 26104197686..3e67915adcd 100644 --- a/mysql-test/suite/perfschema/r/server_init.result +++ b/mysql-test/suite/perfschema/r/server_init.result @@ -56,7 +56,7 @@ where name like "wait/synch/mutex/sql/LOCK_delayed_insert"; count(name) 1 select count(name) from mutex_instances -where name like "wait/synch/mutex/sql/LOCK_uuid_generator"; +where name like "wait/synch/mutex/sql/LOCK_uuid_short_generator"; count(name) 1 select count(name) from mutex_instances diff --git a/mysql-test/suite/perfschema/r/short_option_1.result b/mysql-test/suite/perfschema/r/short_option_1.result index ad48fe05ad9..d97ece1f67a 100644 --- a/mysql-test/suite/perfschema/r/short_option_1.result +++ b/mysql-test/suite/perfschema/r/short_option_1.result @@ -21,7 +21,6 @@ Variable_name Value general_log ON show variables like 'new'; Variable_name Value -new ON show variables like 'log_warnings'; Variable_name Value log_warnings 3 |