From: Alexey Botchkov
Date: January 28 2012 10:04am
Subject: bzr commit into mysql-5.5 branch (holyfoot:3250)
List-Archive: http://lists.mysql.com/commits/142612
Message-Id: <20120128100432.BA0BDD280C7@hfmain.askmonty.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1271748552=="

--===============1271748552==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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;


--===============1271748552==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/holyfoot@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: holyfoot@stripped
# target_branch: file:///home/hf/wmar/mdev57/
# testament_sha1: 76084bd0085ba79b410b0cbba5e5d84c8dbbc407
# timestamp: 2012-01-28 14:04:32 +0400
# base_revision_id: holyfoot@stripped\
#   an6acfhnys4p5gn9
# 
# Begin bundle
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


--===============1271748552==--