Bug#31968366 SET PERSIST FOR COMPONENTS GENERATES A FLOOD OF WARNINGS

  Post push fixes, modified test case files.

  RB#26373

Author: vsmurthys

mysql-test/r/persisted_variables_for_component.result

@@ -70,10 +70,9 @@ VARIABLE_NAME	VARIABLE_VALUE
 INSTALL COMPONENT 'file://component_validate_password';
 SET @@persist.validate_password.length=10;
 SET @@persist.validate_password.check_user_name=OFF;
-SELECT * FROM performance_schema.persisted_variables;
-VARIABLE_NAME	VARIABLE_VALUE
-validate_password.check_user_name	OFF
-validate_password.length	10
+SELECT COUNT(*) FROM performance_schema.persisted_variables;
+COUNT(*)
+2
 UNINSTALL COMPONENT 'file://component_validate_password';
 INSTALL COMPONENT 'file://component_validate_password';
 SELECT COUNT(*) FROM performance_schema.error_log WHERE ERROR_CODE = "MY-013185";

mysql-test/r/read_only_persisted_plugin_variables.result

@@ -116,11 +116,8 @@ count(*)
 # Restart server
 CALL mtr.add_suppression("Plugin audit_log reported *");
 # Both queries must return 101 rows.
-SELECT * FROM performance_schema.persisted_variables;
+SELECT * FROM performance_schema.persisted_variables ORDER BY VARIABLE_NAME;
 VARIABLE_NAME	VARIABLE_VALUE
-replica_type_conversions	
-innodb_log_buffer_size	16777216
-slave_type_conversions	
 back_log	80
 binlog_gtid_simple_recovery	ON
 disabled_storage_engines	
@@ -141,6 +138,7 @@ innodb_ft_max_token_size	84
 innodb_ft_min_token_size	4
 innodb_ft_sort_pll_degree	2
 innodb_ft_total_cache_size	640000000
+innodb_log_buffer_size	16777216
 innodb_log_file_size	50331648
 innodb_log_files_in_group	2
 innodb_open_files	1
@@ -204,12 +202,14 @@ performance_schema_setup_objects_size	-1
 performance_schema_users_size	-1
 relay_log_recovery	OFF
 relay_log_space_limit	0
+replica_type_conversions	
 report_host	
 report_password	
 report_port	21000
 report_user	
 skip_name_resolve	OFF
 skip_show_database	OFF
+slave_type_conversions	
 table_open_cache_instances	16
 thread_handling	one-thread-per-connection
 thread_stack	286720

mysql-test/t/persisted_variables_for_component.test

@@ -99,7 +99,7 @@ INSTALL COMPONENT 'file://component_validate_password';
 SET @@persist.validate_password.length=10;
 SET @@persist.validate_password.check_user_name=OFF;
 # return 2 rows
-SELECT * FROM performance_schema.persisted_variables;
+SELECT COUNT(*) FROM performance_schema.persisted_variables;
 UNINSTALL COMPONENT 'file://component_validate_password';
 INSTALL COMPONENT 'file://component_validate_password';
 # with fix should return 0 rows, without fix it will return 63 rows

mysql-test/t/read_only_persisted_plugin_variables.test

@@ -48,7 +48,7 @@ SELECT count(*) from performance_schema.persisted_variables;
 CALL mtr.add_suppression("Plugin audit_log reported *");
 
 --echo # Both queries must return 101 rows.
-SELECT * FROM performance_schema.persisted_variables;
+SELECT * FROM performance_schema.persisted_variables ORDER BY VARIABLE_NAME;
 SELECT VARIABLE_NAME FROM performance_schema.variables_info WHERE VARIABLE_SOURCE = 'PERSISTED';
 
 RESET PERSIST;