perfschema compilation, test and misc fixes

1 files changed, 26 insertions, 191 deletions

diff --git a/mysql-test/suite/perfschema/r/information_schema.result b/mysql-test/suite/perfschema/r/information_schema.result
index e61fd5001d5..3f4a8cf6336 100644
--- a/mysql-test/suite/perfschema/r/information_schema.result
+++ b/mysql-test/suite/perfschema/r/information_schema.result
@@ -43,21 +43,15 @@ performance_schema	events_waits_summary_global_by_event_name	def
 performance_schema	file_instances	def
 performance_schema	file_summary_by_event_name	def
 performance_schema	file_summary_by_instance	def
-<<<<<<< HEAD
-performance_schema	hosts	def
-performance_schema	host_cache	def
-=======
 performance_schema	global_status	def
-performance_schema	global_variables	def
-performance_schema	host_cache	def
 performance_schema	hosts	def
+performance_schema	host_cache	def
 performance_schema	memory_summary_by_account_by_event_name	def
 performance_schema	memory_summary_by_host_by_event_name	def
 performance_schema	memory_summary_by_thread_by_event_name	def
 performance_schema	memory_summary_by_user_by_event_name	def
 performance_schema	memory_summary_global_by_event_name	def
 performance_schema	metadata_locks	def
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 performance_schema	mutex_instances	def
 performance_schema	objects_summary_global_by_type	def
 performance_schema	performance_timers	def
@@ -65,16 +59,11 @@ performance_schema	prepared_statements_instances	def
 performance_schema	replication_applier_configuration	def
 performance_schema	replication_applier_status	def
 performance_schema	replication_applier_status_by_coordinator	def
-performance_schema	replication_applier_status_by_worker	def
 performance_schema	replication_connection_configuration	def
-performance_schema	replication_connection_status	def
-performance_schema	replication_group_member_stats	def
-performance_schema	replication_group_members	def
 performance_schema	rwlock_instances	def
 performance_schema	session_account_connect_attrs	def
 performance_schema	session_connect_attrs	def
 performance_schema	session_status	def
-performance_schema	session_variables	def
 performance_schema	setup_actors	def
 performance_schema	setup_consumers	def
 performance_schema	setup_instruments	def
@@ -92,9 +81,8 @@ performance_schema	table_io_waits_summary_by_index_usage	def
 performance_schema	table_io_waits_summary_by_table	def
 performance_schema	table_lock_waits_summary_by_table	def
 performance_schema	threads	def
-performance_schema	user_variables_by_thread	def
 performance_schema	users	def
-performance_schema	variables_by_thread	def
+performance_schema	user_variables_by_thread	def
 select lower(TABLE_NAME), TABLE_TYPE, ENGINE
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -140,21 +128,15 @@ events_waits_summary_global_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 file_instances	BASE TABLE	PERFORMANCE_SCHEMA
 file_summary_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 file_summary_by_instance	BASE TABLE	PERFORMANCE_SCHEMA
-<<<<<<< HEAD
-hosts	BASE TABLE	PERFORMANCE_SCHEMA
-host_cache	BASE TABLE	PERFORMANCE_SCHEMA
-=======
 global_status	BASE TABLE	PERFORMANCE_SCHEMA
-global_variables	BASE TABLE	PERFORMANCE_SCHEMA
-host_cache	BASE TABLE	PERFORMANCE_SCHEMA
 hosts	BASE TABLE	PERFORMANCE_SCHEMA
+host_cache	BASE TABLE	PERFORMANCE_SCHEMA
 memory_summary_by_account_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 memory_summary_by_host_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 memory_summary_by_thread_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 memory_summary_by_user_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 memory_summary_global_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 metadata_locks	BASE TABLE	PERFORMANCE_SCHEMA
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 mutex_instances	BASE TABLE	PERFORMANCE_SCHEMA
 objects_summary_global_by_type	BASE TABLE	PERFORMANCE_SCHEMA
 performance_timers	BASE TABLE	PERFORMANCE_SCHEMA
@@ -162,16 +144,11 @@ prepared_statements_instances	BASE TABLE	PERFORMANCE_SCHEMA
 replication_applier_configuration	BASE TABLE	PERFORMANCE_SCHEMA
 replication_applier_status	BASE TABLE	PERFORMANCE_SCHEMA
 replication_applier_status_by_coordinator	BASE TABLE	PERFORMANCE_SCHEMA
-replication_applier_status_by_worker	BASE TABLE	PERFORMANCE_SCHEMA
 replication_connection_configuration	BASE TABLE	PERFORMANCE_SCHEMA
-replication_connection_status	BASE TABLE	PERFORMANCE_SCHEMA
-replication_group_member_stats	BASE TABLE	PERFORMANCE_SCHEMA
-replication_group_members	BASE TABLE	PERFORMANCE_SCHEMA
 rwlock_instances	BASE TABLE	PERFORMANCE_SCHEMA
 session_account_connect_attrs	BASE TABLE	PERFORMANCE_SCHEMA
 session_connect_attrs	BASE TABLE	PERFORMANCE_SCHEMA
 session_status	BASE TABLE	PERFORMANCE_SCHEMA
-session_variables	BASE TABLE	PERFORMANCE_SCHEMA
 setup_actors	BASE TABLE	PERFORMANCE_SCHEMA
 setup_consumers	BASE TABLE	PERFORMANCE_SCHEMA
 setup_instruments	BASE TABLE	PERFORMANCE_SCHEMA
@@ -189,9 +166,8 @@ table_io_waits_summary_by_index_usage	BASE TABLE	PERFORMANCE_SCHEMA
 table_io_waits_summary_by_table	BASE TABLE	PERFORMANCE_SCHEMA
 table_lock_waits_summary_by_table	BASE TABLE	PERFORMANCE_SCHEMA
 threads	BASE TABLE	PERFORMANCE_SCHEMA
-user_variables_by_thread	BASE TABLE	PERFORMANCE_SCHEMA
 users	BASE TABLE	PERFORMANCE_SCHEMA
-variables_by_thread	BASE TABLE	PERFORMANCE_SCHEMA
+user_variables_by_thread	BASE TABLE	PERFORMANCE_SCHEMA
 select lower(TABLE_NAME), VERSION, ROW_FORMAT
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -237,21 +213,15 @@ events_waits_summary_global_by_event_name	10	Dynamic
 file_instances	10	Dynamic
 file_summary_by_event_name	10	Dynamic
 file_summary_by_instance	10	Dynamic
-<<<<<<< HEAD
-hosts	10	Fixed
-host_cache	10	Dynamic
-=======
 global_status	10	Dynamic
-global_variables	10	Dynamic
-host_cache	10	Dynamic
 hosts	10	Fixed
+host_cache	10	Dynamic
 memory_summary_by_account_by_event_name	10	Dynamic
 memory_summary_by_host_by_event_name	10	Dynamic
 memory_summary_by_thread_by_event_name	10	Dynamic
 memory_summary_by_user_by_event_name	10	Dynamic
 memory_summary_global_by_event_name	10	Dynamic
 metadata_locks	10	Dynamic
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 mutex_instances	10	Dynamic
 objects_summary_global_by_type	10	Dynamic
 performance_timers	10	Fixed
@@ -259,16 +229,11 @@ prepared_statements_instances	10	Dynamic
 replication_applier_configuration	10	Fixed
 replication_applier_status	10	Fixed
 replication_applier_status_by_coordinator	10	Dynamic
-replication_applier_status_by_worker	10	Dynamic
 replication_connection_configuration	10	Dynamic
-replication_connection_status	10	Dynamic
-replication_group_member_stats	10	Dynamic
-replication_group_members	10	Fixed
 rwlock_instances	10	Dynamic
 session_account_connect_attrs	10	Dynamic
 session_connect_attrs	10	Dynamic
 session_status	10	Dynamic
-session_variables	10	Dynamic
 setup_actors	10	Fixed
 setup_consumers	10	Dynamic
 setup_instruments	10	Dynamic
@@ -286,13 +251,13 @@ table_io_waits_summary_by_index_usage	10	Dynamic
 table_io_waits_summary_by_table	10	Dynamic
 table_lock_waits_summary_by_table	10	Dynamic
 threads	10	Dynamic
-user_variables_by_thread	10	Dynamic
 users	10	Fixed
-variables_by_thread	10	Dynamic
+user_variables_by_thread	10	Dynamic
 select lower(TABLE_NAME), AVG_ROW_LENGTH
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema' and
-lower(TABLE_NAME) not regexp '^variables|variables$|^status|session_status|global_status';
+lower(TABLE_NAME) not regexp '^variables|variables$|^status|session_status|global_status'
+  order by table_name;
 lower(TABLE_NAME)	AVG_ROW_LENGTH
 accounts	0
 cond_instances	0
@@ -334,8 +299,8 @@ events_waits_summary_global_by_event_name	0
 file_instances	0
 file_summary_by_event_name	0
 file_summary_by_instance	0
-host_cache	0
 hosts	0
+host_cache	0
 memory_summary_by_account_by_event_name	0
 memory_summary_by_host_by_event_name	0
 memory_summary_by_thread_by_event_name	0
@@ -349,11 +314,7 @@ prepared_statements_instances	0
 replication_applier_configuration	0
 replication_applier_status	0
 replication_applier_status_by_coordinator	0
-replication_applier_status_by_worker	0
 replication_connection_configuration	0
-replication_connection_status	0
-replication_group_member_stats	0
-replication_group_members	0
 rwlock_instances	0
 session_account_connect_attrs	0
 session_connect_attrs	0
@@ -370,80 +331,20 @@ table_io_waits_summary_by_index_usage	0
 table_io_waits_summary_by_table	0
 table_lock_waits_summary_by_table	0
 threads	0
-user_variables_by_thread	0
 users	0
+user_variables_by_thread	0
 select lower(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH
 from information_schema.tables
-<<<<<<< HEAD
-where TABLE_SCHEMA='performance_schema'
-  order by table_name;
-lower(TABLE_NAME)	TABLE_ROWS	AVG_ROW_LENGTH
-accounts	1000	0
-cond_instances	1000	0
-events_stages_current	1000	0
-events_stages_history	1000	0
-events_stages_history_long	10000	0
-events_stages_summary_by_account_by_event_name	1000	0
-events_stages_summary_by_host_by_event_name	1000	0
-events_stages_summary_by_thread_by_event_name	1000	0
-events_stages_summary_by_user_by_event_name	1000	0
-events_stages_summary_global_by_event_name	1000	0
-events_statements_current	1000	0
-events_statements_history	1000	0
-events_statements_history_long	10000	0
-events_statements_summary_by_account_by_event_name	1000	0
-events_statements_summary_by_digest	1000	0
-events_statements_summary_by_host_by_event_name	1000	0
-events_statements_summary_by_thread_by_event_name	1000	0
-events_statements_summary_by_user_by_event_name	1000	0
-events_statements_summary_global_by_event_name	1000	0
-events_waits_current	1000	0
-events_waits_history	1000	0
-events_waits_history_long	10000	0
-events_waits_summary_by_account_by_event_name	1000	0
-events_waits_summary_by_host_by_event_name	1000	0
-events_waits_summary_by_instance	1000	0
-events_waits_summary_by_thread_by_event_name	1000	0
-events_waits_summary_by_user_by_event_name	1000	0
-events_waits_summary_global_by_event_name	1000	0
-file_instances	1000	0
-file_summary_by_event_name	1000	0
-file_summary_by_instance	1000	0
-hosts	1000	0
-host_cache	1000	0
-mutex_instances	1000	0
-objects_summary_global_by_type	1000	0
-performance_timers	5	0
-rwlock_instances	1000	0
-session_account_connect_attrs	1000	0
-session_connect_attrs	1000	0
-setup_actors	1	0
-setup_consumers	12	0
-setup_instruments	1000	0
-setup_objects	4	0
-setup_timers	4	0
-socket_instances	1000	0
-socket_summary_by_event_name	1000	0
-socket_summary_by_instance	1000	0
-table_io_waits_summary_by_index_usage	1000	0
-table_io_waits_summary_by_table	1000	0
-table_lock_waits_summary_by_table	1000	0
-threads	1000	0
-users	1000	0
-=======
 where TABLE_SCHEMA='performance_schema' and
-lower(TABLE_NAME) regexp '^variables|variables$|^status|session_status|global_status';
+lower(TABLE_NAME) regexp '^variables|variables$|^status|session_status|global_status'
+  order by table_name;
 lower(TABLE_NAME)	TABLE_ROWS	AVG_ROW_LENGTH
 global_status	table_rows	avg_row_len
-global_variables	table_rows	avg_row_len
 session_status	table_rows	avg_row_len
-session_variables	table_rows	avg_row_len
 status_by_account	table_rows	avg_row_len
 status_by_host	table_rows	avg_row_len
 status_by_thread	table_rows	avg_row_len
 status_by_user	table_rows	avg_row_len
-variables_by_thread	table_rows	avg_row_len
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 select lower(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -489,21 +390,15 @@ events_waits_summary_global_by_event_name	0	0
 file_instances	0	0
 file_summary_by_event_name	0	0
 file_summary_by_instance	0	0
-<<<<<<< HEAD
-hosts	0	0
-host_cache	0	0
-=======
 global_status	0	0
-global_variables	0	0
-host_cache	0	0
 hosts	0	0
+host_cache	0	0
 memory_summary_by_account_by_event_name	0	0
 memory_summary_by_host_by_event_name	0	0
 memory_summary_by_thread_by_event_name	0	0
 memory_summary_by_user_by_event_name	0	0
 memory_summary_global_by_event_name	0	0
 metadata_locks	0	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 mutex_instances	0	0
 objects_summary_global_by_type	0	0
 performance_timers	0	0
@@ -511,16 +406,11 @@ prepared_statements_instances	0	0
 replication_applier_configuration	0	0
 replication_applier_status	0	0
 replication_applier_status_by_coordinator	0	0
-replication_applier_status_by_worker	0	0
 replication_connection_configuration	0	0
-replication_connection_status	0	0
-replication_group_member_stats	0	0
-replication_group_members	0	0
 rwlock_instances	0	0
 session_account_connect_attrs	0	0
 session_connect_attrs	0	0
 session_status	0	0
-session_variables	0	0
 setup_actors	0	0
 setup_consumers	0	0
 setup_instruments	0	0
@@ -538,9 +428,8 @@ table_io_waits_summary_by_index_usage	0	0
 table_io_waits_summary_by_table	0	0
 table_lock_waits_summary_by_table	0	0
 threads	0	0
-user_variables_by_thread	0	0
 users	0	0
-variables_by_thread	0	0
+user_variables_by_thread	0	0
 select lower(TABLE_NAME), INDEX_LENGTH, DATA_FREE, AUTO_INCREMENT
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -586,21 +475,15 @@ events_waits_summary_global_by_event_name	0	0	NULL
 file_instances	0	0	NULL
 file_summary_by_event_name	0	0	NULL
 file_summary_by_instance	0	0	NULL
-<<<<<<< HEAD
-hosts	0	0	NULL
-host_cache	0	0	NULL
-=======
 global_status	0	0	NULL
-global_variables	0	0	NULL
-host_cache	0	0	NULL
 hosts	0	0	NULL
+host_cache	0	0	NULL
 memory_summary_by_account_by_event_name	0	0	NULL
 memory_summary_by_host_by_event_name	0	0	NULL
 memory_summary_by_thread_by_event_name	0	0	NULL
 memory_summary_by_user_by_event_name	0	0	NULL
 memory_summary_global_by_event_name	0	0	NULL
 metadata_locks	0	0	NULL
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 mutex_instances	0	0	NULL
 objects_summary_global_by_type	0	0	NULL
 performance_timers	0	0	NULL
@@ -608,16 +491,11 @@ prepared_statements_instances	0	0	NULL
 replication_applier_configuration	0	0	NULL
 replication_applier_status	0	0	NULL
 replication_applier_status_by_coordinator	0	0	NULL
-replication_applier_status_by_worker	0	0	NULL
 replication_connection_configuration	0	0	NULL
-replication_connection_status	0	0	NULL
-replication_group_member_stats	0	0	NULL
-replication_group_members	0	0	NULL
 rwlock_instances	0	0	NULL
 session_account_connect_attrs	0	0	NULL
 session_connect_attrs	0	0	NULL
 session_status	0	0	NULL
-session_variables	0	0	NULL
 setup_actors	0	0	NULL
 setup_consumers	0	0	NULL
 setup_instruments	0	0	NULL
@@ -635,9 +513,8 @@ table_io_waits_summary_by_index_usage	0	0	NULL
 table_io_waits_summary_by_table	0	0	NULL
 table_lock_waits_summary_by_table	0	0	NULL
 threads	0	0	NULL
-user_variables_by_thread	0	0	NULL
 users	0	0	NULL
-variables_by_thread	0	0	NULL
+user_variables_by_thread	0	0	NULL
 select lower(TABLE_NAME), CREATE_TIME, UPDATE_TIME, CHECK_TIME
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -683,21 +560,15 @@ events_waits_summary_global_by_event_name	NULL	NULL	NULL
 file_instances	NULL	NULL	NULL
 file_summary_by_event_name	NULL	NULL	NULL
 file_summary_by_instance	NULL	NULL	NULL
-<<<<<<< HEAD
-hosts	NULL	NULL	NULL
-host_cache	NULL	NULL	NULL
-=======
 global_status	NULL	NULL	NULL
-global_variables	NULL	NULL	NULL
-host_cache	NULL	NULL	NULL
 hosts	NULL	NULL	NULL
+host_cache	NULL	NULL	NULL
 memory_summary_by_account_by_event_name	NULL	NULL	NULL
 memory_summary_by_host_by_event_name	NULL	NULL	NULL
 memory_summary_by_thread_by_event_name	NULL	NULL	NULL
 memory_summary_by_user_by_event_name	NULL	NULL	NULL
 memory_summary_global_by_event_name	NULL	NULL	NULL
 metadata_locks	NULL	NULL	NULL
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 mutex_instances	NULL	NULL	NULL
 objects_summary_global_by_type	NULL	NULL	NULL
 performance_timers	NULL	NULL	NULL
@@ -705,16 +576,11 @@ prepared_statements_instances	NULL	NULL	NULL
 replication_applier_configuration	NULL	NULL	NULL
 replication_applier_status	NULL	NULL	NULL
 replication_applier_status_by_coordinator	NULL	NULL	NULL
-replication_applier_status_by_worker	NULL	NULL	NULL
 replication_connection_configuration	NULL	NULL	NULL
-replication_connection_status	NULL	NULL	NULL
-replication_group_member_stats	NULL	NULL	NULL
-replication_group_members	NULL	NULL	NULL
 rwlock_instances	NULL	NULL	NULL
 session_account_connect_attrs	NULL	NULL	NULL
 session_connect_attrs	NULL	NULL	NULL
 session_status	NULL	NULL	NULL
-session_variables	NULL	NULL	NULL
 setup_actors	NULL	NULL	NULL
 setup_consumers	NULL	NULL	NULL
 setup_instruments	NULL	NULL	NULL
@@ -732,9 +598,8 @@ table_io_waits_summary_by_index_usage	NULL	NULL	NULL
 table_io_waits_summary_by_table	NULL	NULL	NULL
 table_lock_waits_summary_by_table	NULL	NULL	NULL
 threads	NULL	NULL	NULL
-user_variables_by_thread	NULL	NULL	NULL
 users	NULL	NULL	NULL
-variables_by_thread	NULL	NULL	NULL
+user_variables_by_thread	NULL	NULL	NULL
 select lower(TABLE_NAME), TABLE_COLLATION, CHECKSUM
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -780,21 +645,15 @@ events_waits_summary_global_by_event_name	utf8_general_ci	NULL
 file_instances	utf8_general_ci	NULL
 file_summary_by_event_name	utf8_general_ci	NULL
 file_summary_by_instance	utf8_general_ci	NULL
-<<<<<<< HEAD
-hosts	utf8_general_ci	NULL
-host_cache	utf8_general_ci	NULL
-=======
 global_status	utf8_general_ci	NULL
-global_variables	utf8_general_ci	NULL
-host_cache	utf8_general_ci	NULL
 hosts	utf8_general_ci	NULL
+host_cache	utf8_general_ci	NULL
 memory_summary_by_account_by_event_name	utf8_general_ci	NULL
 memory_summary_by_host_by_event_name	utf8_general_ci	NULL
 memory_summary_by_thread_by_event_name	utf8_general_ci	NULL
 memory_summary_by_user_by_event_name	utf8_general_ci	NULL
 memory_summary_global_by_event_name	utf8_general_ci	NULL
 metadata_locks	utf8_general_ci	NULL
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 mutex_instances	utf8_general_ci	NULL
 objects_summary_global_by_type	utf8_general_ci	NULL
 performance_timers	utf8_general_ci	NULL
@@ -802,16 +661,11 @@ prepared_statements_instances	utf8_general_ci	NULL
 replication_applier_configuration	utf8_general_ci	NULL
 replication_applier_status	utf8_general_ci	NULL
 replication_applier_status_by_coordinator	utf8_general_ci	NULL
-replication_applier_status_by_worker	utf8_general_ci	NULL
 replication_connection_configuration	utf8_general_ci	NULL
-replication_connection_status	utf8_general_ci	NULL
-replication_group_member_stats	utf8_general_ci	NULL
-replication_group_members	utf8_general_ci	NULL
 rwlock_instances	utf8_general_ci	NULL
 session_account_connect_attrs	utf8_bin	NULL
 session_connect_attrs	utf8_bin	NULL
 session_status	utf8_general_ci	NULL
-session_variables	utf8_general_ci	NULL
 setup_actors	utf8_general_ci	NULL
 setup_consumers	utf8_general_ci	NULL
 setup_instruments	utf8_general_ci	NULL
@@ -829,12 +683,12 @@ table_io_waits_summary_by_index_usage	utf8_general_ci	NULL
 table_io_waits_summary_by_table	utf8_general_ci	NULL
 table_lock_waits_summary_by_table	utf8_general_ci	NULL
 threads	utf8_general_ci	NULL
-user_variables_by_thread	utf8_general_ci	NULL
 users	utf8_general_ci	NULL
-variables_by_thread	utf8_general_ci	NULL
+user_variables_by_thread	utf8_general_ci	NULL
 select lower(TABLE_NAME), CREATE_OPTIONS
 from information_schema.tables
-where TABLE_SCHEMA='performance_schema';
+where TABLE_SCHEMA='performance_schema'
+  order by table_name;
 lower(TABLE_NAME)	CREATE_OPTIONS
 accounts	
 cond_instances	
@@ -877,9 +731,8 @@ file_instances
 file_summary_by_event_name	
 file_summary_by_instance	
 global_status	
-global_variables	
-host_cache	
 hosts	
+host_cache	
 memory_summary_by_account_by_event_name	
 memory_summary_by_host_by_event_name	
 memory_summary_by_thread_by_event_name	
@@ -893,16 +746,11 @@ prepared_statements_instances
 replication_applier_configuration	
 replication_applier_status	
 replication_applier_status_by_coordinator	
-replication_applier_status_by_worker	
 replication_connection_configuration	
-replication_connection_status	
-replication_group_member_stats	
-replication_group_members	
 rwlock_instances	
 session_account_connect_attrs	
 session_connect_attrs	
 session_status	
-session_variables	
 setup_actors	
 setup_consumers	
 setup_instruments	
@@ -920,9 +768,8 @@ table_io_waits_summary_by_index_usage
 table_io_waits_summary_by_table	
 table_lock_waits_summary_by_table	
 threads	
-user_variables_by_thread	
 users	
-variables_by_thread	
+user_variables_by_thread	
 select lower(TABLE_NAME), TABLE_COMMENT
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -968,21 +815,15 @@ events_waits_summary_global_by_event_name
 file_instances	
 file_summary_by_event_name	
 file_summary_by_instance	
-<<<<<<< HEAD
-hosts	
-host_cache	
-=======
 global_status	
-global_variables	
-host_cache	
 hosts	
+host_cache	
 memory_summary_by_account_by_event_name	
 memory_summary_by_host_by_event_name	
 memory_summary_by_thread_by_event_name	
 memory_summary_by_user_by_event_name	
 memory_summary_global_by_event_name	
 metadata_locks	
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 mutex_instances	
 objects_summary_global_by_type	
 performance_timers	
@@ -990,16 +831,11 @@ prepared_statements_instances
 replication_applier_configuration	
 replication_applier_status	
 replication_applier_status_by_coordinator	
-replication_applier_status_by_worker	
 replication_connection_configuration	
-replication_connection_status	
-replication_group_member_stats	
-replication_group_members	
 rwlock_instances	
 session_account_connect_attrs	
 session_connect_attrs	
 session_status	
-session_variables	
 setup_actors	
 setup_consumers	
 setup_instruments	
@@ -1017,6 +853,5 @@ table_io_waits_summary_by_index_usage
 table_io_waits_summary_by_table	
 table_lock_waits_summary_by_table	
 threads	
-user_variables_by_thread	
 users	
-variables_by_thread	
+user_variables_by_thread