From d7f765cfe7dc56f85c6f56c4bb2f382befe77156 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 28 Jan 2012 11:05:47 +0100 Subject: [PATCH] Make perfschema.all_instances work with OpenSSL, which has an extra rwlock_instance. --- mysql-test/suite/perfschema/r/all_instances.result | 4 +++- mysql-test/suite/perfschema/t/all_instances.test | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/perfschema/r/all_instances.result b/mysql-test/suite/perfschema/r/all_instances.result index 756b5207714..7eb2bc73d8e 100644 --- a/mysql-test/suite/perfschema/r/all_instances.result +++ b/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 diff --git a/mysql-test/suite/perfschema/t/all_instances.test b/mysql-test/suite/perfschema/t/all_instances.test index 18e1f0c179f..46b2c06c327 100644 --- a/mysql-test/suite/perfschema/t/all_instances.test +++ b/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;