Merge branch 'merge-perfschema-5.6' into 10.0

MariaDB · Jan 28, 2019 · c2197e0 · c2197e0
2 parents a3df9bc + 1abdc0e
commit c2197e0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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)