1 files changed, 12 insertions, 47 deletions
diff --git a/mysql-test/suite/sys_vars/inc/sysvars_server.inc b/mysql-test/suite/sys_vars/inc/sysvars_server.inc
index af1b0ce4563..8e2df93dcdd 100644
--- a/mysql-test/suite/sys_vars/inc/sysvars_server.inc
+++ b/mysql-test/suite/sys_vars/inc/sysvars_server.inc
@@ -12,59 +12,24 @@ set sql_mode=ansi_quotes;
 # global_value_origin=SQL
 set global div_precision_increment=5;
 
---replace_regex /^\/\S+/PATH/
---replace_result $MASTER_MYPORT MASTER_MYPORT 392192 299008
-select * from information_schema.system_variables
-  where variable_name not like 'aria%' and
-        variable_name not like 'debug%' and
-        variable_name not like 'wsrep%' and
-        variable_name not in (
-          'in_predicate_conversion_threshold',
-          'have_openssl',
-          'have_symlink',
-          'hostname',
-          'large_files_support', 'log_tc_size',
-          'lower_case_file_system',
-          'lower_case_table_names',
-          'open_files_limit',
-          'plugin_maturity',
-          'rand_seed1',
-          'rand_seed2',
-          'system_time_zone',
-          'version_comment',
-          'version_source_revision',
-          'version_compile_machine', 'version_compile_os',
-          'version_malloc_library', 'version_ssl_library', 'version'
-        )
-  order by variable_name;
+# Don't show values or origin as they may have been changed by the test
+# or different recompilation. Remove variables that are depending on
+# configuration options
 
-# now various metadata but no values, for variables where
-# values change often
-select VARIABLE_NAME, VARIABLE_SCOPE, VARIABLE_TYPE, VARIABLE_COMMENT,
-       NUMERIC_MIN_VALUE, NUMERIC_MAX_VALUE, NUMERIC_BLOCK_SIZE,
-       ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT
+--replace_regex /^\/\S+/PATH/
+select VARIABLE_NAME,VARIABLE_SCOPE,VARIABLE_TYPE,VARIABLE_COMMENT,NUMERIC_MIN_VALUE,NUMERIC_MAX_VALUE,NUMERIC_BLOCK_SIZE,ENUM_VALUE_LIST,READ_ONLY,COMMAND_LINE_ARGUMENT
   from information_schema.system_variables
-  where variable_name in (
-          'have_openssl',
-          'have_symlink',
-          'hostname',
-          'large_files_support',
-          'lower_case_file_system',
-          'lower_case_table_names',
-          'open_files_limit',
-          'rand_seed1',
-          'rand_seed2',
-          'system_time_zone',
-          'version_comment',
-          'version_source_revision',
-          'version_compile_machine', 'version_compile_os',
-          'version_malloc_library', 'version_ssl_library', 'version'
+  where variable_name not like 'debug%' and
+          variable_name not like 'wsrep%' and
+          variable_name not like 's3%' and
+          variable_name not in (
+          'log_tc_size',
+          'in_predicate_conversion_threshold'
         )
   order by variable_name;
 
 # yet less data: no values, no blocks size, no min/max value.
-select VARIABLE_NAME, GLOBAL_VALUE_ORIGIN, VARIABLE_SCOPE, VARIABLE_TYPE,
-       VARIABLE_COMMENT, ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT
+select VARIABLE_NAME, GLOBAL_VALUE_ORIGIN, VARIABLE_SCOPE, VARIABLE_TYPE, VARIABLE_COMMENT, ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT
   from information_schema.system_variables
   where variable_name in (
           'log_tc_size'