MDEV-20220 post push fix

Remove garbage files.

dml_handler.diff

-diff --git a/mysql-test/suite/perfschema/r/dml_handler.result b/mysql-test/suite/perfschema/r/dml_handler.result
-index ce4ae6bf9a3..61bbba3189e 100644
---- a/mysql-test/suite/perfschema/r/dml_handler.result
-+++ b/mysql-test/suite/perfschema/r/dml_handler.result
-@@ -12,78 +12,81 @@ Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be
- # For each table in the performance schema, attempt HANDLER...OPEN,
- # which should fail with an error 1031, ER_ILLEGAL_HA.
- #
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=80;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=81;
- HANDLER performance_schema.user_variables_by_thread OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`user_variables_by_thread` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=79;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=80;
- HANDLER performance_schema.users OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`users` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=78;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=79;
- HANDLER performance_schema.threads OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`threads` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=77;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=78;
- HANDLER performance_schema.table_lock_waits_summary_by_table OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_lock_waits_summary_by_table` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=76;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=77;
- HANDLER performance_schema.table_io_waits_summary_by_table OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_io_waits_summary_by_table` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=75;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=76;
- HANDLER performance_schema.table_io_waits_summary_by_index_usage OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_io_waits_summary_by_index_usage` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=74;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=75;
- HANDLER performance_schema.table_handles OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_handles` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=73;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=74;
- HANDLER performance_schema.status_by_user OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`status_by_user` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=72;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=73;
- HANDLER performance_schema.status_by_thread OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`status_by_thread` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=71;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=72;
- HANDLER performance_schema.status_by_host OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`status_by_host` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=70;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=71;
- HANDLER performance_schema.status_by_account OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`status_by_account` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=69;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=70;
- HANDLER performance_schema.socket_summary_by_instance OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_summary_by_instance` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=68;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=69;
- HANDLER performance_schema.socket_summary_by_event_name OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_summary_by_event_name` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=67;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=68;
- HANDLER performance_schema.socket_instances OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_instances` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=66;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=67;
- HANDLER performance_schema.setup_timers OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_timers` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=65;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=66;
- HANDLER performance_schema.setup_objects OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_objects` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=64;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=65;
- HANDLER performance_schema.setup_instruments OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_instruments` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=63;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=64;
- HANDLER performance_schema.setup_consumers OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_consumers` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=62;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=63;
- HANDLER performance_schema.setup_actors OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_actors` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=61;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=62;
- HANDLER performance_schema.session_status OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`session_status` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=60;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=61;
- HANDLER performance_schema.session_connect_attrs OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`session_connect_attrs` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=59;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=60;
- HANDLER performance_schema.session_account_connect_attrs OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`session_account_connect_attrs` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=58;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=59;
- HANDLER performance_schema.rwlock_instances OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`rwlock_instances` doesn't have this option
--SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=57;
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=58;
- HANDLER performance_schema.replication_connection_configuration OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`replication_connection_configuration` doesn't have this option
-+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=57;
-+HANDLER performance_schema.replication_applier_status_by_worker OPEN;
-+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`replication_applier_status_by_worker` doesn't have this option
- SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=56;
- HANDLER performance_schema.replication_applier_status_by_coordinator OPEN;
- ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`replication_applier_status_by_coordinator` doesn't have this option
-

information_schema.diff

-diff --git a/mysql-test/suite/perfschema/r/information_schema.result b/mysql-test/suite/perfschema/r/information_schema.result
-index 3f4a8cf6336..c0aff9bb956 100644
---- a/mysql-test/suite/perfschema/r/information_schema.result
-+++ b/mysql-test/suite/perfschema/r/information_schema.result
-@@ -59,6 +59,7 @@ 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	rwlock_instances	def
- performance_schema	session_account_connect_attrs	def
-@@ -144,6 +145,7 @@ 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
- rwlock_instances	BASE TABLE	PERFORMANCE_SCHEMA
- session_account_connect_attrs	BASE TABLE	PERFORMANCE_SCHEMA
-@@ -229,6 +231,7 @@ 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
- rwlock_instances	10	Dynamic
- session_account_connect_attrs	10	Dynamic
-@@ -314,6 +317,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
- rwlock_instances	0
- session_account_connect_attrs	0
-@@ -406,6 +410,7 @@ 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
- rwlock_instances	0	0
- session_account_connect_attrs	0	0
-@@ -491,6 +496,7 @@ 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
- rwlock_instances	0	0	NULL
- session_account_connect_attrs	0	0	NULL
-@@ -576,6 +582,7 @@ 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
- rwlock_instances	NULL	NULL	NULL
- session_account_connect_attrs	NULL	NULL	NULL
-@@ -661,6 +668,7 @@ 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
- rwlock_instances	utf8_general_ci	NULL
- session_account_connect_attrs	utf8_bin	NULL
-@@ -746,6 +754,7 @@ prepared_statements_instances
- replication_applier_configuration	
- replication_applier_status	
- replication_applier_status_by_coordinator	
-+replication_applier_status_by_worker	
- replication_connection_configuration	
- rwlock_instances	
- session_account_connect_attrs	
-@@ -831,6 +840,7 @@ prepared_statements_instances
- replication_applier_configuration	
- replication_applier_status	
- replication_applier_status_by_coordinator	
-+replication_applier_status_by_worker	
- replication_connection_configuration	
- rwlock_instances	
- session_account_connect_attrs