diff options
Diffstat (limited to 'mysql-test/suite/perfschema')
9 files changed, 17 insertions, 26 deletions
diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result index 7dbb7274c1d..fefc4f46061 100644 --- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result +++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result @@ -37,7 +37,6 @@ where name like 'Wait/Synch/Cond/sql/%' order by name limit 10; NAME ENABLED TIMED wait/synch/cond/sql/COND_flush_thread_cache YES YES -wait/synch/cond/sql/COND_global_read_lock YES YES wait/synch/cond/sql/COND_manager YES YES wait/synch/cond/sql/COND_queue_state YES YES wait/synch/cond/sql/COND_rpl_status YES YES @@ -46,6 +45,7 @@ wait/synch/cond/sql/COND_thread_cache YES YES wait/synch/cond/sql/COND_thread_count YES YES wait/synch/cond/sql/Delayed_insert::cond YES YES wait/synch/cond/sql/Delayed_insert::cond_client YES YES +wait/synch/cond/sql/Event_scheduler::COND_state YES YES select * from performance_schema.setup_instruments where name='Wait'; select * from performance_schema.setup_instruments diff --git a/mysql-test/suite/perfschema/r/func_file_io.result b/mysql-test/suite/perfschema/r/func_file_io.result index 781851bd11c..d99e77dcd8c 100644 --- a/mysql-test/suite/perfschema/r/func_file_io.result +++ b/mysql-test/suite/perfschema/r/func_file_io.result @@ -100,3 +100,4 @@ INNER JOIN performance_schema.threads p USING (THREAD_ID) WHERE p.PROCESSLIST_ID = 1 GROUP BY h.EVENT_NAME HAVING TOTAL_WAIT > 0; +UPDATE performance_schema.setup_instruments SET enabled = 'YES'; diff --git a/mysql-test/suite/perfschema/r/func_mutex.result b/mysql-test/suite/perfschema/r/func_mutex.result index d767455609d..93a8ae5d218 100644 --- a/mysql-test/suite/perfschema/r/func_mutex.result +++ b/mysql-test/suite/perfschema/r/func_mutex.result @@ -110,4 +110,5 @@ WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_rw_timed; test_fm2_rw_timed Success +UPDATE performance_schema.setup_instruments SET enabled = 'YES'; DROP TABLE t1; diff --git a/mysql-test/suite/perfschema/r/global_read_lock.result b/mysql-test/suite/perfschema/r/global_read_lock.result index 8a58c072b7a..d71bcf81ea7 100644 --- a/mysql-test/suite/perfschema/r/global_read_lock.result +++ b/mysql-test/suite/perfschema/r/global_read_lock.result @@ -1,4 +1,5 @@ use performance_schema; +update performance_schema.setup_instruments set enabled='YES'; grant SELECT, UPDATE, LOCK TABLES on performance_schema.* to pfsuser@localhost; flush privileges; connect (con1, localhost, pfsuser, , test); @@ -21,9 +22,9 @@ select event_name, left(source, locate(":", source)) as short_source, timer_end, timer_wait, operation from performance_schema.events_waits_current -where event_name like "wait/synch/cond/sql/COND_global_read_lock"; +where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status"; event_name short_source timer_end timer_wait operation -wait/synch/cond/sql/COND_global_read_lock lock.cc: NULL NULL wait +wait/synch/cond/sql/MDL_context::COND_wait_status mdl.cc: NULL NULL timed_wait unlock tables; update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES'; diff --git a/mysql-test/suite/perfschema/r/server_init.result b/mysql-test/suite/perfschema/r/server_init.result index 950b63fd94c..b6f1d4828c3 100644 --- a/mysql-test/suite/perfschema/r/server_init.result +++ b/mysql-test/suite/perfschema/r/server_init.result @@ -88,10 +88,6 @@ where name like "wait/synch/mutex/sql/LOCK_manager"; count(name) 1 select count(name) from mutex_instances -where name like "wait/synch/mutex/sql/LOCK_global_read_lock"; -count(name) -1 -select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_global_system_variables"; count(name) 1 @@ -120,10 +116,6 @@ where name like "wait/synch/mutex/sql/Query_cache::structure_guard_mutex"; count(name) 1 select count(name) from mutex_instances -where name like "wait/synch/mutex/sql/LOCK_event_metadata"; -count(name) -1 -select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_event_queue"; count(name) 1 @@ -184,10 +176,6 @@ where name like "wait/synch/cond/sql/COND_manager"; count(name) 1 select count(name) from cond_instances -where name like "wait/synch/cond/sql/COND_global_read_lock"; -count(name) -1 -select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_thread_cache"; count(name) 1 diff --git a/mysql-test/suite/perfschema/t/func_file_io.test b/mysql-test/suite/perfschema/t/func_file_io.test index 911f97b5d6c..64f71a99ee6 100644 --- a/mysql-test/suite/perfschema/t/func_file_io.test +++ b/mysql-test/suite/perfschema/t/func_file_io.test @@ -190,3 +190,6 @@ HAVING TOTAL_WAIT > 0; ## HAVING BYTES > 0 ## ORDER BY i.user, h.operation; ## --enable_result_log + +# Clean-up. +UPDATE performance_schema.setup_instruments SET enabled = 'YES'; diff --git a/mysql-test/suite/perfschema/t/func_mutex.test b/mysql-test/suite/perfschema/t/func_mutex.test index 31d81e4b004..51cbc77790e 100644 --- a/mysql-test/suite/perfschema/t/func_mutex.test +++ b/mysql-test/suite/perfschema/t/func_mutex.test @@ -128,4 +128,6 @@ SET @after_count = (SELECT SUM(TIMER_WAIT) SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_rw_timed; +# Clean-up. +UPDATE performance_schema.setup_instruments SET enabled = 'YES'; DROP TABLE t1; diff --git a/mysql-test/suite/perfschema/t/global_read_lock.test b/mysql-test/suite/perfschema/t/global_read_lock.test index 711e72ede76..d00c6583e31 100644 --- a/mysql-test/suite/perfschema/t/global_read_lock.test +++ b/mysql-test/suite/perfschema/t/global_read_lock.test @@ -22,6 +22,10 @@ use performance_schema; +# Make test robust against errors in other tests. +# Ensure that instrumentation is turned on when we create new connection. +update performance_schema.setup_instruments set enabled='YES'; + grant SELECT, UPDATE, LOCK TABLES on performance_schema.* to pfsuser@localhost; flush privileges; @@ -60,7 +64,7 @@ lock tables performance_schema.setup_instruments write; --echo connection default; connection default; -let $wait_condition= select 1 from performance_schema.events_waits_current where event_name like "wait/synch/cond/sql/COND_global_read_lock"; +let $wait_condition= select 1 from performance_schema.events_waits_current where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status"; --source include/wait_condition.inc @@ -69,7 +73,7 @@ select event_name, left(source, locate(":", source)) as short_source, timer_end, timer_wait, operation from performance_schema.events_waits_current - where event_name like "wait/synch/cond/sql/COND_global_read_lock"; + where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status"; unlock tables; diff --git a/mysql-test/suite/perfschema/t/server_init.test b/mysql-test/suite/perfschema/t/server_init.test index 93663118772..33eeeb7edb2 100644 --- a/mysql-test/suite/perfschema/t/server_init.test +++ b/mysql-test/suite/perfschema/t/server_init.test @@ -101,9 +101,6 @@ select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_manager"; select count(name) from mutex_instances - where name like "wait/synch/mutex/sql/LOCK_global_read_lock"; - -select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_global_system_variables"; select count(name) from mutex_instances @@ -133,9 +130,6 @@ select count(name) from mutex_instances # where name like "wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state"; select count(name) from mutex_instances - where name like "wait/synch/mutex/sql/LOCK_event_metadata"; - -select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_event_queue"; select count(name) from mutex_instances @@ -189,9 +183,6 @@ select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_manager"; select count(name) from cond_instances - where name like "wait/synch/cond/sql/COND_global_read_lock"; - -select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_thread_cache"; select count(name) from cond_instances |