1 files changed, 18 insertions, 35 deletions
diff --git a/mysql-test/suite/perfschema/r/server_init.result b/mysql-test/suite/perfschema/r/server_init.result
index 25f3f180735..82f53ad5b74 100644
--- a/mysql-test/suite/perfschema/r/server_init.result
+++ b/mysql-test/suite/perfschema/r/server_init.result
@@ -1,9 +1,5 @@
 use performance_schema;
 select count(name) from mutex_instances
-where name like "wait/synch/mutex/mysys/THR_LOCK_threads";
-count(name)
-1
-select count(name) from mutex_instances
 where name like "wait/synch/mutex/mysys/THR_LOCK_malloc";
 count(name)
 1
@@ -27,12 +23,16 @@ select count(name) from mutex_instances
 where name like "wait/synch/mutex/mysys/THR_LOCK_charset";
 count(name)
 1
-select count(name) from cond_instances
-where name like "wait/synch/cond/mysys/THR_COND_threads";
+select count(name) from mutex_instances
+<<<<<<< HEAD
+where name like "wait/synch/mutex/sql/LOCK_thread_count";
+=======
+where name like "wait/synch/mutex/sql/LOCK_open";
 count(name)
 1
 select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_thread_count";
+where name like "wait/synch/mutex/sql/LOCK_thd_list";
+>>>>>>> merge-perfschema-5.7
 count(name)
 1
 select count(name) from mutex_instances
@@ -44,31 +44,19 @@ where name like "wait/synch/mutex/sql/LOCK_status";
 count(name)
 1
 select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_error_log";
-count(name)
-1
-select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_delayed_insert";
-count(name)
-1
-select count(name) from mutex_instances
 where name like "wait/synch/mutex/sql/LOCK_uuid_generator";
 count(name)
 0
 select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_delayed_status";
-count(name)
-1
-select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_delayed_create";
-count(name)
-1
-select count(name) from mutex_instances
 where name like "wait/synch/mutex/sql/LOCK_crypt";
 count(name)
 1
 select count(name) from mutex_instances
+<<<<<<< HEAD
 where name like "wait/synch/mutex/sql/LOCK_active_mi";
+=======
+where name like "wait/synch/mutex/sql/LOCK_slave_list";
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
 count(name)
 1
 select count(name) from mutex_instances
@@ -88,10 +76,6 @@ where name like "wait/synch/mutex/sql/LOCK_prepared_stmt_count";
 count(name)
 1
 select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_connection_count";
-count(name)
-1
-select count(name) from mutex_instances
 where name like "wait/synch/mutex/sql/LOCK_server_started";
 count(name)
 1
@@ -104,18 +88,21 @@ where name like "wait/synch/mutex/sql/LOCK_event_queue";
 count(name)
 1
 select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_user_locks";
+where name like "wait/synch/mutex/sql/LOCK_item_func_sleep";
 count(name)
 1
 select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/Cversion_lock";
+where name like "wait/synch/mutex/sql/LOCK_audit_mask";
 count(name)
 1
 select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_audit_mask";
+<<<<<<< HEAD
+=======
+where name like "wait/synch/mutex/sql/LOCK_transaction_cache";
 count(name)
 1
 select count(name) from mutex_instances
+>>>>>>> merge-perfschema-5.7
 where name like "wait/synch/mutex/sql/LOCK_plugin";
 count(name)
 1
@@ -124,10 +111,6 @@ where name like "wait/synch/mutex/sql/tz_LOCK";
 count(name)
 1
 select count(name) from rwlock_instances
-where name like "wait/synch/rwlock/sql/LOCK_grant";
-count(name)
-1
-select count(name) from rwlock_instances
 where name like "wait/synch/rwlock/sql/LOCK_sys_init_connect";
 count(name)
 1
@@ -150,7 +133,7 @@ count(name)
 select count(name) from cond_instances
 where name like "wait/synch/cond/sql/COND_thread_count";
 count(name)
-1
+0
 select count(name) from cond_instances
 where name like "wait/synch/cond/sql/COND_manager";
 count(name)