mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'merge-perfschema-5.6' into 10.0

Browse source
This commit is contained in:
Oleksandr Byelkin 2019-01-28 13:16:27 +01:00
commit c2197e0cd2
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/suite/perfschema/r/dml_setup_instruments.result
View file

@ -16,7 +16,9 @@ wait/synch/mutex/sql/LOCK_binlog_state YES YES
wait/synch/mutex/sql/LOCK_commit_ordered YES YES wait/synch/mutex/sql/LOCK_commit_ordered YES YES
select * from performance_schema.setup_instruments select * from performance_schema.setup_instruments
where name like 'Wait/Synch/Rwlock/sql/%' where name like 'Wait/Synch/Rwlock/sql/%'
and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock') and name not in (
'wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock',
'wait/synch/rwlock/sql/LOCK_named_pipe_full_access_group')
order by name limit 10; order by name limit 10;
NAME ENABLED TIMED NAME ENABLED TIMED
wait/synch/rwlock/sql/LOCK_dboptions YES YES wait/synch/rwlock/sql/LOCK_dboptions YES YES

5
mysql-test/suite/perfschema/t/dml_setup_instruments.test
View file

@ -22,10 +22,13 @@ select * from performance_schema.setup_instruments
order by name limit 10; order by name limit 10;
# CRYPTO_dynlock_value::lock is dependent on the build (SSL) # CRYPTO_dynlock_value::lock is dependent on the build (SSL)
# LOCK_named_pipe_full_access_group is dependent on the build (Windows)
select * from performance_schema.setup_instruments select * from performance_schema.setup_instruments
where name like 'Wait/Synch/Rwlock/sql/%' where name like 'Wait/Synch/Rwlock/sql/%'
and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock') and name not in (
'wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock',
'wait/synch/rwlock/sql/LOCK_named_pipe_full_access_group')
order by name limit 10; order by name limit 10;
# COND_handler_count is dependent on the build (Windows only) # COND_handler_count is dependent on the build (Windows only)