bzr commit into mysql-5.5 branch (holyfoot:3250)

[Alexey Botchkov]

#At file:///home/hf/wmar/mdev57/ based on revid:holyfoot@stripped

 3250 Alexey Botchkov	2012-01-28 [merge]
      mergin.

    modified:
      mysql-test/suite/perfschema/r/all_instances.result
      mysql-test/suite/perfschema/t/all_instances.test
=== modified file 'mysql-test/suite/perfschema/r/all_instances.result'
--- a/mysql-test/suite/perfschema/r/all_instances.result	2011-11-03 22:39:53 +0000
+++ b/mysql-test/suite/perfschema/r/all_instances.result	2012-01-28 10:05:47 +0000
@@ -83,7 +83,9 @@ wait/synch/mutex/sql/TABLE_SHARE::LOCK_h
 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

=== modified file 'mysql-test/suite/perfschema/t/all_instances.test'
--- a/mysql-test/suite/perfschema/t/all_instances.test	2012-01-06 12:07:20 +0000
+++ b/mysql-test/suite/perfschema/t/all_instances.test	2012-01-28 10:05:47 +0000
@@ -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;


Attachment: [text/bzr-bundle] bzr/[e-mail]