diff options
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/perfschema/r/all_instances.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/perfschema/r/func_mutex.result | 44 | ||||
| -rw-r--r-- | mysql-test/suite/perfschema/t/func_mutex.test | 18 |
3 files changed, 23 insertions, 40 deletions
diff --git a/mysql-test/suite/perfschema/r/all_instances.result b/mysql-test/suite/perfschema/r/all_instances.result index d59f17847e2..616ff646c5c 100644 --- a/mysql-test/suite/perfschema/r/all_instances.result +++ b/mysql-test/suite/perfschema/r/all_instances.result @@ -64,6 +64,7 @@ wait/synch/mutex/sql/LOCK_server_started wait/synch/mutex/sql/LOCK_slave_list wait/synch/mutex/sql/LOCK_stats wait/synch/mutex/sql/LOCK_status +wait/synch/mutex/sql/LOCK_thread_cache wait/synch/mutex/sql/LOCK_thread_count wait/synch/mutex/sql/LOCK_user_conn wait/synch/mutex/sql/LOCK_user_locks diff --git a/mysql-test/suite/perfschema/r/func_mutex.result b/mysql-test/suite/perfschema/r/func_mutex.result index 2cb1d3da80d..0e948897f9d 100644 --- a/mysql-test/suite/perfschema/r/func_mutex.result +++ b/mysql-test/suite/perfschema/r/func_mutex.result @@ -70,52 +70,34 @@ Success TRUNCATE TABLE performance_schema.events_waits_history_long; TRUNCATE TABLE performance_schema.events_waits_history; TRUNCATE TABLE performance_schema.events_waits_current; -SELECT * FROM t1 WHERE id = 1; -id b -1 initial value +show variables like "%not_found%"; +Variable_name Value SET @before_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long -WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); -SELECT * FROM t1; -id b -1 initial value -2 initial value -3 initial value -4 initial value -5 initial value -6 initial value -7 initial value -8 initial value +WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash')); +show variables like "%not_found%"; +Variable_name Value SET @after_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long -WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); +WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash')); SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_rw_timed; test_fm1_rw_timed Success UPDATE performance_schema.setup_instruments SET enabled = 'NO' -WHERE NAME = 'wait/synch/rwlock/sql/LOCK_grant'; +WHERE NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash'; TRUNCATE TABLE performance_schema.events_waits_history_long; TRUNCATE TABLE performance_schema.events_waits_history; TRUNCATE TABLE performance_schema.events_waits_current; -SELECT * FROM t1 WHERE id = 1; -id b -1 initial value +show variables like "%not_found%"; +Variable_name Value SET @before_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long -WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); -SELECT * FROM t1; -id b -1 initial value -2 initial value -3 initial value -4 initial value -5 initial value -6 initial value -7 initial value -8 initial value +WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash')); +show variables like "%not_found%"; +Variable_name Value SET @after_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long -WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); +WHERE (EVENT_NAME = 'LOCK_system_variables_hash')); SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_rw_timed; test_fm2_rw_timed Success diff --git a/mysql-test/suite/perfschema/t/func_mutex.test b/mysql-test/suite/perfschema/t/func_mutex.test index a96b497ffec..42f8c8d59ff 100644 --- a/mysql-test/suite/perfschema/t/func_mutex.test +++ b/mysql-test/suite/perfschema/t/func_mutex.test @@ -87,38 +87,38 @@ TRUNCATE TABLE performance_schema.events_waits_history_long; TRUNCATE TABLE performance_schema.events_waits_history; TRUNCATE TABLE performance_schema.events_waits_current; -SELECT * FROM t1 WHERE id = 1; +show variables like "%not_found%"; SET @before_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long - WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); + WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash')); -SELECT * FROM t1; +show variables like "%not_found%"; SET @after_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long - WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); + WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash')); SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_rw_timed; UPDATE performance_schema.setup_instruments SET enabled = 'NO' -WHERE NAME = 'wait/synch/rwlock/sql/LOCK_grant'; +WHERE NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash'; TRUNCATE TABLE performance_schema.events_waits_history_long; TRUNCATE TABLE performance_schema.events_waits_history; TRUNCATE TABLE performance_schema.events_waits_current; -SELECT * FROM t1 WHERE id = 1; +show variables like "%not_found%"; SET @before_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long - WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); + WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash')); -SELECT * FROM t1; +show variables like "%not_found%"; SET @after_count = (SELECT SUM(TIMER_WAIT) FROM performance_schema.events_waits_history_long - WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); + WHERE (EVENT_NAME = 'LOCK_system_variables_hash')); SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_rw_timed; |