merge from 5.5

3 files changed, 10 insertions, 7 deletions

diff --git a/mysql-test/suite/perfschema/r/all_instances.result b/mysql-test/suite/perfschema/r/all_instances.result
index 7eb2bc73d8e..59b1950cb88 100644
--- a/mysql-test/suite/perfschema/r/all_instances.result
+++ b/mysql-test/suite/perfschema/r/all_instances.result
@@ -1,5 +1,8 @@
 use performance_schema;
-select name from mutex_instances where name not rlike '/(DEBUG_SYNC::mutex)$' group by name;
+select name from mutex_instances
+where name not rlike '/(DEBUG_SYNC::mutex)$'
+   and name != 'wait/synch/mutex/mysys/BITMAP::mutex'
+ group by name;
 name
 wait/synch/mutex/archive/archive_mutex
 wait/synch/mutex/aria/LOCK_trn_list
@@ -16,7 +19,6 @@ wait/synch/mutex/blackhole/blackhole
 wait/synch/mutex/csv/tina
 wait/synch/mutex/memory/HP_SHARE::intern_lock
 wait/synch/mutex/myisam/MYISAM_SHARE::intern_lock
-wait/synch/mutex/mysys/BITMAP::mutex
 wait/synch/mutex/mysys/KEY_CACHE::cache_lock
 wait/synch/mutex/mysys/LOCK_alarm
 wait/synch/mutex/mysys/LOCK_uuid_generator
@@ -51,7 +53,6 @@ wait/synch/mutex/sql/LOCK_global_index_stats
 wait/synch/mutex/sql/LOCK_global_system_variables
 wait/synch/mutex/sql/LOCK_global_table_stats
 wait/synch/mutex/sql/LOCK_global_user_client_stats
-wait/synch/mutex/sql/LOCK_manager
 wait/synch/mutex/sql/LOCK_open
 wait/synch/mutex/sql/LOCK_plugin
 wait/synch/mutex/sql/LOCK_prepared_stmt_count
@@ -112,7 +113,6 @@ wait/synch/cond/mysys/COND_alarm
 wait/synch/cond/mysys/my_thread_var::suspend
 wait/synch/cond/mysys/THR_COND_threads
 wait/synch/cond/sql/COND_flush_thread_cache
-wait/synch/cond/sql/COND_manager
 wait/synch/cond/sql/COND_queue_state
 wait/synch/cond/sql/COND_rpl_status
 wait/synch/cond/sql/COND_server_started
diff --git a/mysql-test/suite/perfschema/r/server_init.result b/mysql-test/suite/perfschema/r/server_init.result
index 3e67915adcd..5497267080e 100644
--- a/mysql-test/suite/perfschema/r/server_init.result
+++ b/mysql-test/suite/perfschema/r/server_init.result
@@ -82,7 +82,7 @@ count(name)
 select count(name) from mutex_instances
 where name like "wait/synch/mutex/sql/LOCK_manager";
 count(name)
-1
+0
 select count(name) from mutex_instances
 where name like "wait/synch/mutex/sql/LOCK_global_system_variables";
 count(name)
@@ -170,7 +170,7 @@ count(name)
 select count(name) from cond_instances
 where name like "wait/synch/cond/sql/COND_manager";
 count(name)
-1
+0
 select count(name) from cond_instances
 where name like "wait/synch/cond/sql/COND_thread_cache";
 count(name)
diff --git a/mysql-test/suite/perfschema/t/all_instances.test b/mysql-test/suite/perfschema/t/all_instances.test
index d5dc6ffc2b2..53d542b6650 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;
 # "where" filters out instances that can be conditionally compiled out
 #
 
-select name from mutex_instances where name not rlike '/(DEBUG_SYNC::mutex)$' group by name;
+select name from mutex_instances
+ where name not rlike '/(DEBUG_SYNC::mutex)$'
+   and name != 'wait/synch/mutex/mysys/BITMAP::mutex'
+ 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")