diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-28 13:16:27 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-28 13:16:27 +0100 |
| commit | c2197e0cd2a12cc7b76db74437ff6f60970bf314 (patch) | |
| tree | b71cb4ed27792e3c562502b99445c16d67e1bbca | |
| parent | a3df9bcadc57be70bdadc8cf21290e4fe6c9b37a (diff) | |
| parent | 1abdc0e435e4e7e71257e246972a3b3015df287c (diff) | |
| download | mariadb-git-c2197e0cd2a12cc7b76db74437ff6f60970bf314.tar.gz | |
Merge branch 'merge-perfschema-5.6' into 10.0
| -rw-r--r-- | mysql-test/suite/perfschema/r/dml_setup_instruments.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/perfschema/t/dml_setup_instruments.test | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result index b264a075eba..8d561c48828 100644 --- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result +++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result @@ -16,7 +16,9 @@ wait/synch/mutex/sql/LOCK_binlog_state YES YES wait/synch/mutex/sql/LOCK_commit_ordered 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') + 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; NAME ENABLED TIMED wait/synch/rwlock/sql/LOCK_dboptions YES YES diff --git a/mysql-test/suite/perfschema/t/dml_setup_instruments.test b/mysql-test/suite/perfschema/t/dml_setup_instruments.test index 6b4fe89a1cf..098d6bd031d 100644 --- a/mysql-test/suite/perfschema/t/dml_setup_instruments.test +++ b/mysql-test/suite/perfschema/t/dml_setup_instruments.test @@ -22,10 +22,13 @@ select * from performance_schema.setup_instruments order by name limit 10; # 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 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; # COND_handler_count is dependent on the build (Windows only) |