[Commits] 1abdc0e435e: 5.6.43

Oleksandr Byelkin sanja at mariadb.com
Thu Jan 24 16:47:27 EET 2019


revision-id: 1abdc0e435e4e7e71257e246972a3b3015df287c ()
parent(s): a9a0d0c3729ad3c6e295f68b6d4d5552b999a2e5
author: Oleksandr Byelkin
committer: Oleksandr Byelkin
timestamp: 2019-01-24 15:47:27 +0100
message:

5.6.43

---
 mysql-test/suite/perfschema/r/dml_setup_instruments.result | 4 +++-
 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 310ff60aa5b..7bc7ca785d6 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_crypt	YES	YES
 wait/synch/mutex/sql/LOCK_delayed_create	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/Binlog_relay_IO_delegate::lock	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 8a4f11ba51f..18c260e1555 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)


More information about the commits mailing list