Fixed merge problem (naming of CRYPTO_dynlock_value::lock in the tests)

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

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

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

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