mergin.

mysql-test/suite/perfschema/r/all_instances.result

@@ -83,7 +83,9 @@ wait/synch/mutex/sql/TABLE_SHARE::LOCK_ha_data
 wait/synch/mutex/sql/THD::LOCK_thd_data
 wait/synch/mutex/sql/THD::LOCK_wakeup_ready
 wait/synch/mutex/sql/tz_LOCK
-select name from rwlock_instances group by name;
+select name from rwlock_instances
+where name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock")
+group by name;
 name
 wait/synch/rwlock/aria/TRANSLOG_DESCRIPTOR::open_files_lock
 wait/synch/rwlock/myisam/MYISAM_SHARE::key_root_lock

mysql-test/suite/perfschema/t/all_instances.test

@@ -18,7 +18,10 @@ use performance_schema;
 #
 
 select name from mutex_instances where name not rlike '/(DEBUG_SYNC::mutex)$' group by name;
-select name from rwlock_instances group by name;
+# CRYPTO_dynlock_value::lock exists only when building with OpenSSL (not YaSSL).
+select name from rwlock_instances
+       where name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock")
+       group by name;
 select name from cond_instances where name not rlike '/(DEBUG_SYNC::cond)$' group by name;
 select event_name from file_instances group by event_name;
 select name from threads group by name;