merge: 5.1 -> 5.1-rpl-merge

conflicts:
  Text conflict in mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result
  Text conflict in mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test

527 files changed, 73 insertions, 96 deletions

diff --git a/mysql-test/include/charset_basic.inc b/mysql-test/suite/sys_vars/inc/charset_basic.inc
index e3331697f2c..e3331697f2c 100644
--- a/mysql-test/include/charset_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/charset_basic.inc
diff --git a/mysql-test/include/collation_basic.inc b/mysql-test/suite/sys_vars/inc/collation_basic.inc
index be8ae36eeb8..be8ae36eeb8 100644
--- a/mysql-test/include/collation_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/collation_basic.inc
diff --git a/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc b/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc
index 1a3f9e1efe2..1f8c63c55bb 100644
--- a/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc
@@ -36,7 +36,6 @@
 ############################################################################### 
 
 SET @start_value = @@global.query_cache_size;
-SELECT @start_value;
 
 --echo '#--------------------FN_DYNVARS_133_01------------------------#'
 ############################################################################### 
@@ -53,7 +52,7 @@ SELECT @@global.query_cache_size;
 ############################################### 
 
 SET @@global.query_cache_size = @start_value;
-SELECT @@global.query_cache_size = 0;
+SELECT @@global.query_cache_size = @start_value; 
 
 --echo '#--------------------FN_DYNVARS_133_03------------------------#'
 ################################################################################ 
@@ -167,7 +166,6 @@ SELECT query_cache_size = @@session.query_cache_size;
 ##############################
 
 SET @@global.query_cache_size = @start_value;
-SELECT @@global.query_cache_size;
 
 ######################################################################## 
 #              END OF query_cache_size TESTS                   #
diff --git a/mysql-test/suite/sys_vars/inc/query_prealloc_size_basic.inc b/mysql-test/suite/sys_vars/inc/query_prealloc_size_basic.inc
index 3a8608736c5..64eb3c4b329 100644
--- a/mysql-test/suite/sys_vars/inc/query_prealloc_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/query_prealloc_size_basic.inc
@@ -74,8 +74,8 @@ SELECT @@session.query_prealloc_size   = 8192;
 SET @@global.query_prealloc_size   = 8192;
 SELECT @@global.query_prealloc_size  ;
 
-SET @@global.query_prealloc_size   = 4294967295;
-SELECT @@global.query_prealloc_size  ;
+#SET @@global.query_prealloc_size   = 4294967295;
+#SELECT @@global.query_prealloc_size  ;
 
 SET @@global.query_prealloc_size   = 655354;
 SELECT @@global.query_prealloc_size  ;
@@ -89,8 +89,8 @@ SELECT @@global.query_prealloc_size  ;
 SET @@session.query_prealloc_size   = 8192;
 SELECT @@session.query_prealloc_size  ;
 
-SET @@session.query_prealloc_size   = 4294967295;
-SELECT @@session.query_prealloc_size  ;
+#SET @@session.query_prealloc_size   = 4294967295;
+#SELECT @@session.query_prealloc_size  ;
 
 SET @@session.query_prealloc_size   = 655345;
 SELECT @@session.query_prealloc_size  ;
@@ -106,11 +106,11 @@ SELECT @@session.query_prealloc_size  ;
 SET @@global.query_prealloc_size   = 0;
 SELECT @@global.query_prealloc_size  ;
 
-SET @@global.query_prealloc_size   = -1024;
-SELECT @@global.query_prealloc_size  ;
+#SET @@global.query_prealloc_size   = -1024;
+#SELECT @@global.query_prealloc_size  ;
 
-SET @@global.query_prealloc_size   = 429496729533;
-SELECT @@global.query_prealloc_size  ;
+#SET @@global.query_prealloc_size   = 429496729533;
+#SELECT @@global.query_prealloc_size  ;
 
 
 --Error ER_PARSE_ERROR
@@ -137,8 +137,8 @@ SELECT @@global.query_prealloc_size  ;
 SET @@session.query_prealloc_size   = 0;
 SELECT @@session.query_prealloc_size  ;
 
-SET @@session.query_prealloc_size   = -2;
-SELECT @@session.query_prealloc_size  ;
+#SET @@session.query_prealloc_size   = -2;
+#SELECT @@session.query_prealloc_size  ;
 
 --Error ER_PARSE_ERROR
 
diff --git a/mysql-test/suite/sys_vars/inc/timestamp_basic.inc b/mysql-test/suite/sys_vars/inc/timestamp_basic.inc
index d7ad620ec26..9ef57c97043 100644
--- a/mysql-test/suite/sys_vars/inc/timestamp_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/timestamp_basic.inc
@@ -18,8 +18,8 @@
 #              * Scope & Access method                                        #
 #              * Data Integrity                                               #
 #                                                                             #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/                          #
-#  server-system-variables.html                                               #
+# Reference:                                                                  #
+# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html         #
 #                                                                             #
 ###############################################################################
 
@@ -102,9 +102,10 @@ SET @@timestamp = 9999999999999999999999;
 #     Check if the value in SESSION Table matches value in variable     #
 #########################################################################
 
-SELECT @@timestamp = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='timestamp';
+# disabled due to bug#41584
+#SELECT @@timestamp = VARIABLE_VALUE 
+#FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
+#WHERE VARIABLE_NAME='timestamp';
 
 --echo '#---------------------FN_DYNVARS_001_08-------------------------#'
 ############################################################################# 
diff --git a/mysql-test/r/auto_commit_basic.result b/mysql-test/suite/sys_vars/r/auto_commit_basic.result
index c3643aaa1db..c3643aaa1db 100644
--- a/mysql-test/r/auto_commit_basic.result
+++ b/mysql-test/suite/sys_vars/r/auto_commit_basic.result
diff --git a/mysql-test/r/auto_increment_increment_basic.result b/mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result
index c453d2322cf..c453d2322cf 100644
--- a/mysql-test/r/auto_increment_increment_basic.result
+++ b/mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result
diff --git a/mysql-test/r/auto_increment_increment_func.result b/mysql-test/suite/sys_vars/r/auto_increment_increment_func.result
index f0f1ada6d95..f0f1ada6d95 100644
--- a/mysql-test/r/auto_increment_increment_func.result
+++ b/mysql-test/suite/sys_vars/r/auto_increment_increment_func.result
diff --git a/mysql-test/r/auto_increment_offset_basic.result b/mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result
index b5ccca8ce56..b5ccca8ce56 100644
--- a/mysql-test/r/auto_increment_offset_basic.result
+++ b/mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result
diff --git a/mysql-test/r/auto_increment_offset_func.result b/mysql-test/suite/sys_vars/r/auto_increment_offset_func.result
index 5c953544e73..5c953544e73 100644
--- a/mysql-test/r/auto_increment_offset_func.result
+++ b/mysql-test/suite/sys_vars/r/auto_increment_offset_func.result
diff --git a/mysql-test/r/autocommit_func.result b/mysql-test/suite/sys_vars/r/autocommit_func.result
index 47c2c921022..47c2c921022 100644
--- a/mysql-test/r/autocommit_func.result
+++ b/mysql-test/suite/sys_vars/r/autocommit_func.result
diff --git a/mysql-test/r/automatic_sp_privileges_basic.result b/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result
index b9cf9b5ee80..b9cf9b5ee80 100644
--- a/mysql-test/r/automatic_sp_privileges_basic.result
+++ b/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result
diff --git a/mysql-test/r/automatic_sp_privileges_func.result b/mysql-test/suite/sys_vars/r/automatic_sp_privileges_func.result
index dac956fb091..dac956fb091 100644
--- a/mysql-test/r/automatic_sp_privileges_func.result
+++ b/mysql-test/suite/sys_vars/r/automatic_sp_privileges_func.result
diff --git a/mysql-test/r/basedir_basic.result b/mysql-test/suite/sys_vars/r/basedir_basic.result
index 9b18f08305c..9b18f08305c 100644
--- a/mysql-test/r/basedir_basic.result
+++ b/mysql-test/suite/sys_vars/r/basedir_basic.result
diff --git a/mysql-test/r/big_tables_basic.result b/mysql-test/suite/sys_vars/r/big_tables_basic.result
index 937576a76d3..937576a76d3 100644
--- a/mysql-test/r/big_tables_basic.result
+++ b/mysql-test/suite/sys_vars/r/big_tables_basic.result
diff --git a/mysql-test/r/binlog_format_basic.result b/mysql-test/suite/sys_vars/r/binlog_format_basic.result
index 0d76d9686e3..0d76d9686e3 100644
--- a/mysql-test/r/binlog_format_basic.result
+++ b/mysql-test/suite/sys_vars/r/binlog_format_basic.result
diff --git a/mysql-test/r/character_set_client_basic.result b/mysql-test/suite/sys_vars/r/character_set_client_basic.result
index c946d5109a8..c946d5109a8 100644
--- a/mysql-test/r/character_set_client_basic.result
+++ b/mysql-test/suite/sys_vars/r/character_set_client_basic.result
diff --git a/mysql-test/r/character_set_client_func.result b/mysql-test/suite/sys_vars/r/character_set_client_func.result
index 087db21639b..087db21639b 100644
--- a/mysql-test/r/character_set_client_func.result
+++ b/mysql-test/suite/sys_vars/r/character_set_client_func.result
diff --git a/mysql-test/r/character_set_connection_basic.result b/mysql-test/suite/sys_vars/r/character_set_connection_basic.result
index 18697a20fb9..18697a20fb9 100644
--- a/mysql-test/r/character_set_connection_basic.result
+++ b/mysql-test/suite/sys_vars/r/character_set_connection_basic.result
diff --git a/mysql-test/r/character_set_connection_func.result b/mysql-test/suite/sys_vars/r/character_set_connection_func.result
index 6fc33a4f369..6fc33a4f369 100644
--- a/mysql-test/r/character_set_connection_func.result
+++ b/mysql-test/suite/sys_vars/r/character_set_connection_func.result
diff --git a/mysql-test/r/character_set_database_basic.result b/mysql-test/suite/sys_vars/r/character_set_database_basic.result
index 4380fea4c81..4380fea4c81 100644
--- a/mysql-test/r/character_set_database_basic.result
+++ b/mysql-test/suite/sys_vars/r/character_set_database_basic.result
diff --git a/mysql-test/r/character_set_database_func.result b/mysql-test/suite/sys_vars/r/character_set_database_func.result
index bc512c73855..bc512c73855 100644
--- a/mysql-test/r/character_set_database_func.result
+++ b/mysql-test/suite/sys_vars/r/character_set_database_func.result
diff --git a/mysql-test/r/character_set_filesystem_basic.result b/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result
index 11f85528593..11f85528593 100644
--- a/mysql-test/r/character_set_filesystem_basic.result
+++ b/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result
diff --git a/mysql-test/r/character_set_results_basic.result b/mysql-test/suite/sys_vars/r/character_set_results_basic.result
index 71c01a3dc0d..71c01a3dc0d 100644
--- a/mysql-test/r/character_set_results_basic.result
+++ b/mysql-test/suite/sys_vars/r/character_set_results_basic.result
diff --git a/mysql-test/r/character_set_results_func.result b/mysql-test/suite/sys_vars/r/character_set_results_func.result
index d92821fdfa6..d92821fdfa6 100644
--- a/mysql-test/r/character_set_results_func.result
+++ b/mysql-test/suite/sys_vars/r/character_set_results_func.result
diff --git a/mysql-test/r/character_set_server_basic.result b/mysql-test/suite/sys_vars/r/character_set_server_basic.result
index 83545128a76..83545128a76 100644
--- a/mysql-test/r/character_set_server_basic.result
+++ b/mysql-test/suite/sys_vars/r/character_set_server_basic.result
diff --git a/mysql-test/r/character_set_server_func.result b/mysql-test/suite/sys_vars/r/character_set_server_func.result
index 3731f27adae..3731f27adae 100644
--- a/mysql-test/r/character_set_server_func.result
+++ b/mysql-test/suite/sys_vars/r/character_set_server_func.result
diff --git a/mysql-test/r/character_set_system_basic.result b/mysql-test/suite/sys_vars/r/character_set_system_basic.result
index 9f4b68ae861..9f4b68ae861 100644
--- a/mysql-test/r/character_set_system_basic.result
+++ b/mysql-test/suite/sys_vars/r/character_set_system_basic.result
diff --git a/mysql-test/r/collation_connection_basic.result b/mysql-test/suite/sys_vars/r/collation_connection_basic.result
index bc6074e2614..bc6074e2614 100644
--- a/mysql-test/r/collation_connection_basic.result
+++ b/mysql-test/suite/sys_vars/r/collation_connection_basic.result
diff --git a/mysql-test/r/collation_connection_func.result b/mysql-test/suite/sys_vars/r/collation_connection_func.result
index 18f82dc60e1..18f82dc60e1 100644
--- a/mysql-test/r/collation_connection_func.result
+++ b/mysql-test/suite/sys_vars/r/collation_connection_func.result
diff --git a/mysql-test/r/collation_database_basic.result b/mysql-test/suite/sys_vars/r/collation_database_basic.result
index d4375b7c8e4..d4375b7c8e4 100644
--- a/mysql-test/r/collation_database_basic.result
+++ b/mysql-test/suite/sys_vars/r/collation_database_basic.result
diff --git a/mysql-test/r/collation_database_func.result b/mysql-test/suite/sys_vars/r/collation_database_func.result
index dae8677eecf..dae8677eecf 100644
--- a/mysql-test/r/collation_database_func.result
+++ b/mysql-test/suite/sys_vars/r/collation_database_func.result
diff --git a/mysql-test/r/collation_server_basic.result b/mysql-test/suite/sys_vars/r/collation_server_basic.result
index 5e36643a3c9..5e36643a3c9 100644
--- a/mysql-test/r/collation_server_basic.result
+++ b/mysql-test/suite/sys_vars/r/collation_server_basic.result
diff --git a/mysql-test/r/collation_server_func.result b/mysql-test/suite/sys_vars/r/collation_server_func.result
index 98672bc452b..98672bc452b 100644
--- a/mysql-test/r/collation_server_func.result
+++ b/mysql-test/suite/sys_vars/r/collation_server_func.result
diff --git a/mysql-test/r/completion_type_basic.result b/mysql-test/suite/sys_vars/r/completion_type_basic.result
index 93bfe581182..93bfe581182 100644
--- a/mysql-test/r/completion_type_basic.result
+++ b/mysql-test/suite/sys_vars/r/completion_type_basic.result
diff --git a/mysql-test/r/completion_type_func.result b/mysql-test/suite/sys_vars/r/completion_type_func.result
index daee738c10d..daee738c10d 100644
--- a/mysql-test/r/completion_type_func.result
+++ b/mysql-test/suite/sys_vars/r/completion_type_func.result
diff --git a/mysql-test/r/concurrent_insert_basic.result b/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result
index e6614ea6abb..e6614ea6abb 100644
--- a/mysql-test/r/concurrent_insert_basic.result
+++ b/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result
diff --git a/mysql-test/r/concurrent_insert_func.result b/mysql-test/suite/sys_vars/r/concurrent_insert_func.result
index 774775a8287..774775a8287 100644
--- a/mysql-test/r/concurrent_insert_func.result
+++ b/mysql-test/suite/sys_vars/r/concurrent_insert_func.result
diff --git a/mysql-test/r/connect_timeout_basic.result b/mysql-test/suite/sys_vars/r/connect_timeout_basic.result
index 7cdd747fc15..7cdd747fc15 100644
--- a/mysql-test/r/connect_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/connect_timeout_basic.result
diff --git a/mysql-test/r/datadir_basic.result b/mysql-test/suite/sys_vars/r/datadir_basic.result
index ade6f2873e8..ade6f2873e8 100644
--- a/mysql-test/r/datadir_basic.result
+++ b/mysql-test/suite/sys_vars/r/datadir_basic.result
diff --git a/mysql-test/r/default_week_format_basic.result b/mysql-test/suite/sys_vars/r/default_week_format_basic.result
index d513ef1c41e..d513ef1c41e 100644
--- a/mysql-test/r/default_week_format_basic.result
+++ b/mysql-test/suite/sys_vars/r/default_week_format_basic.result
diff --git a/mysql-test/r/default_week_format_func.result b/mysql-test/suite/sys_vars/r/default_week_format_func.result
index 279a1785255..279a1785255 100644
--- a/mysql-test/r/default_week_format_func.result
+++ b/mysql-test/suite/sys_vars/r/default_week_format_func.result
diff --git a/mysql-test/r/delay_key_write_basic.result b/mysql-test/suite/sys_vars/r/delay_key_write_basic.result
index 100c62ac47e..100c62ac47e 100644
--- a/mysql-test/r/delay_key_write_basic.result
+++ b/mysql-test/suite/sys_vars/r/delay_key_write_basic.result
diff --git a/mysql-test/r/delay_key_write_func.result b/mysql-test/suite/sys_vars/r/delay_key_write_func.result
index d55cca7ab8e..d55cca7ab8e 100644
--- a/mysql-test/r/delay_key_write_func.result
+++ b/mysql-test/suite/sys_vars/r/delay_key_write_func.result
diff --git a/mysql-test/r/delayed_insert_limit_func.result b/mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result
index d7129d24498..d7129d24498 100644
--- a/mysql-test/r/delayed_insert_limit_func.result
+++ b/mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result
diff --git a/mysql-test/r/delayed_insert_timeout_basic.result b/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result
index 4049907eb80..4049907eb80 100644
--- a/mysql-test/r/delayed_insert_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result
diff --git a/mysql-test/r/div_precision_increment_basic.result b/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result
index d0311afa681..d0311afa681 100644
--- a/mysql-test/r/div_precision_increment_basic.result
+++ b/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result
diff --git a/mysql-test/r/div_precision_increment_func.result b/mysql-test/suite/sys_vars/r/div_precision_increment_func.result
index eb1fc7ae3a7..eb1fc7ae3a7 100644
--- a/mysql-test/r/div_precision_increment_func.result
+++ b/mysql-test/suite/sys_vars/r/div_precision_increment_func.result
diff --git a/mysql-test/r/engine_condition_pushdown_basic.result b/mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result
index 7073066c2f1..7073066c2f1 100644
--- a/mysql-test/r/engine_condition_pushdown_basic.result
+++ b/mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result
diff --git a/mysql-test/r/error_count_basic.result b/mysql-test/suite/sys_vars/r/error_count_basic.result
index ea48b7d5b73..ea48b7d5b73 100644
--- a/mysql-test/r/error_count_basic.result
+++ b/mysql-test/suite/sys_vars/r/error_count_basic.result
diff --git a/mysql-test/r/event_scheduler_basic.result b/mysql-test/suite/sys_vars/r/event_scheduler_basic.result
index 8042187d39d..8042187d39d 100644
--- a/mysql-test/r/event_scheduler_basic.result
+++ b/mysql-test/suite/sys_vars/r/event_scheduler_basic.result
diff --git a/mysql-test/r/event_scheduler_func.result b/mysql-test/suite/sys_vars/r/event_scheduler_func.result
index 8da942e919c..8da942e919c 100644
--- a/mysql-test/r/event_scheduler_func.result
+++ b/mysql-test/suite/sys_vars/r/event_scheduler_func.result
diff --git a/mysql-test/r/expire_logs_days_basic.result b/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result
index 66aa5fa42a5..66aa5fa42a5 100644
--- a/mysql-test/r/expire_logs_days_basic.result
+++ b/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result
diff --git a/mysql-test/r/flush_basic.result b/mysql-test/suite/sys_vars/r/flush_basic.result
index 259f8f929a1..259f8f929a1 100644
--- a/mysql-test/r/flush_basic.result
+++ b/mysql-test/suite/sys_vars/r/flush_basic.result
diff --git a/mysql-test/r/foreign_key_checks_basic.result b/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result
index e09e680fe99..e09e680fe99 100644
--- a/mysql-test/r/foreign_key_checks_basic.result
+++ b/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result
diff --git a/mysql-test/r/foreign_key_checks_func.result b/mysql-test/suite/sys_vars/r/foreign_key_checks_func.result
index c2898293f83..c2898293f83 100644
--- a/mysql-test/r/foreign_key_checks_func.result
+++ b/mysql-test/suite/sys_vars/r/foreign_key_checks_func.result
diff --git a/mysql-test/r/ft_boolean_syntax_basic.result b/mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result
index 94a052172bb..94a052172bb 100644
--- a/mysql-test/r/ft_boolean_syntax_basic.result
+++ b/mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result
diff --git a/mysql-test/r/ft_boolean_syntax_func.result b/mysql-test/suite/sys_vars/r/ft_boolean_syntax_func.result
index 4a3159c77c3..4a3159c77c3 100644
--- a/mysql-test/r/ft_boolean_syntax_func.result
+++ b/mysql-test/suite/sys_vars/r/ft_boolean_syntax_func.result
diff --git a/mysql-test/r/general_log_basic.result b/mysql-test/suite/sys_vars/r/general_log_basic.result
index 18a5fde45c0..18a5fde45c0 100644
--- a/mysql-test/r/general_log_basic.result
+++ b/mysql-test/suite/sys_vars/r/general_log_basic.result
diff --git a/mysql-test/r/general_log_file_basic.result b/mysql-test/suite/sys_vars/r/general_log_file_basic.result
index 48a8d90b55e..48a8d90b55e 100644
--- a/mysql-test/r/general_log_file_basic.result
+++ b/mysql-test/suite/sys_vars/r/general_log_file_basic.result
diff --git a/mysql-test/r/general_log_file_func.result b/mysql-test/suite/sys_vars/r/general_log_file_func.result
index 482a03c1a97..482a03c1a97 100644
--- a/mysql-test/r/general_log_file_func.result
+++ b/mysql-test/suite/sys_vars/r/general_log_file_func.result
diff --git a/mysql-test/r/general_log_func.result b/mysql-test/suite/sys_vars/r/general_log_func.result
index 39ba90265d5..39ba90265d5 100644
--- a/mysql-test/r/general_log_func.result
+++ b/mysql-test/suite/sys_vars/r/general_log_func.result
diff --git a/mysql-test/r/group_concat_max_len_basic.result b/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result
index 5704f00c014..5704f00c014 100644
--- a/mysql-test/r/group_concat_max_len_basic.result
+++ b/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result
diff --git a/mysql-test/r/group_concat_max_len_func.result b/mysql-test/suite/sys_vars/r/group_concat_max_len_func.result
index 52d67b8d274..52d67b8d274 100644
--- a/mysql-test/r/group_concat_max_len_func.result
+++ b/mysql-test/suite/sys_vars/r/group_concat_max_len_func.result
diff --git a/mysql-test/r/have_compress_basic.result b/mysql-test/suite/sys_vars/r/have_compress_basic.result
index 9b48d0c4dff..9b48d0c4dff 100644
--- a/mysql-test/r/have_compress_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_compress_basic.result
diff --git a/mysql-test/r/have_crypt_basic.result b/mysql-test/suite/sys_vars/r/have_crypt_basic.result
index 3a3c221290b..3a3c221290b 100644
--- a/mysql-test/r/have_crypt_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_crypt_basic.result
diff --git a/mysql-test/r/have_csv_basic.result b/mysql-test/suite/sys_vars/r/have_csv_basic.result
index 3427d633f98..3427d633f98 100644
--- a/mysql-test/r/have_csv_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_csv_basic.result
diff --git a/mysql-test/r/have_dynamic_loading_basic.result b/mysql-test/suite/sys_vars/r/have_dynamic_loading_basic.result
index fba43958a69..fba43958a69 100644
--- a/mysql-test/r/have_dynamic_loading_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_dynamic_loading_basic.result
diff --git a/mysql-test/r/have_geometry_basic.result b/mysql-test/suite/sys_vars/r/have_geometry_basic.result
index 1d5a379c7bc..1d5a379c7bc 100644
--- a/mysql-test/r/have_geometry_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_geometry_basic.result
diff --git a/mysql-test/r/have_innodb_basic.result b/mysql-test/suite/sys_vars/r/have_innodb_basic.result
index 017512f3ae0..017512f3ae0 100644
--- a/mysql-test/r/have_innodb_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_innodb_basic.result
diff --git a/mysql-test/r/have_ndbcluster_basic.result b/mysql-test/suite/sys_vars/r/have_ndbcluster_basic.result
index 1b662311072..1b662311072 100644
--- a/mysql-test/r/have_ndbcluster_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_ndbcluster_basic.result
diff --git a/mysql-test/r/have_openssl_basic.result b/mysql-test/suite/sys_vars/r/have_openssl_basic.result
index 1fce883a02f..1fce883a02f 100644
--- a/mysql-test/r/have_openssl_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_openssl_basic.result
diff --git a/mysql-test/r/have_partitioning_basic.result b/mysql-test/suite/sys_vars/r/have_partitioning_basic.result
index 8a18288a3ec..8a18288a3ec 100644
--- a/mysql-test/r/have_partitioning_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_partitioning_basic.result
diff --git a/mysql-test/r/have_query_cache_basic.result b/mysql-test/suite/sys_vars/r/have_query_cache_basic.result
index 4baca716698..4baca716698 100644
--- a/mysql-test/r/have_query_cache_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_query_cache_basic.result
diff --git a/mysql-test/r/have_rtree_keys_basic.result b/mysql-test/suite/sys_vars/r/have_rtree_keys_basic.result
index 7d34f1faaed..7d34f1faaed 100644
--- a/mysql-test/r/have_rtree_keys_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_rtree_keys_basic.result
diff --git a/mysql-test/r/have_ssl_basic.result b/mysql-test/suite/sys_vars/r/have_ssl_basic.result
index a425363c03c..a425363c03c 100644
--- a/mysql-test/r/have_ssl_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_ssl_basic.result
diff --git a/mysql-test/r/have_symlink_basic.result b/mysql-test/suite/sys_vars/r/have_symlink_basic.result
index 999cbb66519..999cbb66519 100644
--- a/mysql-test/r/have_symlink_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_symlink_basic.result
diff --git a/mysql-test/r/hostname_basic.result b/mysql-test/suite/sys_vars/r/hostname_basic.result
index c4357a4fbb4..c4357a4fbb4 100644
--- a/mysql-test/r/hostname_basic.result
+++ b/mysql-test/suite/sys_vars/r/hostname_basic.result
diff --git a/mysql-test/r/identity_basic.result b/mysql-test/suite/sys_vars/r/identity_basic.result
index 60f3edcc030..60f3edcc030 100644
--- a/mysql-test/r/identity_basic.result
+++ b/mysql-test/suite/sys_vars/r/identity_basic.result
diff --git a/mysql-test/r/identity_func.result b/mysql-test/suite/sys_vars/r/identity_func.result
index ba430e72a1f..ba430e72a1f 100644
--- a/mysql-test/r/identity_func.result
+++ b/mysql-test/suite/sys_vars/r/identity_func.result
diff --git a/mysql-test/r/init_connect_basic.result b/mysql-test/suite/sys_vars/r/init_connect_basic.result
index 58f7a9d2ccd..58f7a9d2ccd 100644
--- a/mysql-test/r/init_connect_basic.result
+++ b/mysql-test/suite/sys_vars/r/init_connect_basic.result
diff --git a/mysql-test/r/init_slave_basic.result b/mysql-test/suite/sys_vars/r/init_slave_basic.result
index 87272f1489b..87272f1489b 100644
--- a/mysql-test/r/init_slave_basic.result
+++ b/mysql-test/suite/sys_vars/r/init_slave_basic.result
diff --git a/mysql-test/r/innodb_additional_mem_pool_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_additional_mem_pool_size_basic.result
index fb062d62bc6..fb062d62bc6 100644
--- a/mysql-test/r/innodb_additional_mem_pool_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_additional_mem_pool_size_basic.result
diff --git a/mysql-test/r/innodb_autoextend_increment_basic.result b/mysql-test/suite/sys_vars/r/innodb_autoextend_increment_basic.result
index 69a8b6cc430..69a8b6cc430 100644
--- a/mysql-test/r/innodb_autoextend_increment_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_autoextend_increment_basic.result
diff --git a/mysql-test/r/innodb_autoinc_lock_mode_basic.result b/mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_basic.result
index 9188cf07417..9188cf07417 100644
--- a/mysql-test/r/innodb_autoinc_lock_mode_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_basic.result
diff --git a/mysql-test/r/innodb_autoinc_lock_mode_func.result b/mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_func.result
index f8082cfaedb..f8082cfaedb 100644
--- a/mysql-test/r/innodb_autoinc_lock_mode_func.result
+++ b/mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_func.result
diff --git a/mysql-test/r/innodb_buffer_pool_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result
index 27e6cae41ef..27e6cae41ef 100644
--- a/mysql-test/r/innodb_buffer_pool_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result
diff --git a/mysql-test/r/innodb_checksums_basic.result b/mysql-test/suite/sys_vars/r/innodb_checksums_basic.result
index ac4bed60eb5..ac4bed60eb5 100644
--- a/mysql-test/r/innodb_checksums_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_checksums_basic.result
diff --git a/mysql-test/r/innodb_commit_concurrency_basic.result b/mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result
index 301016d4362..301016d4362 100644
--- a/mysql-test/r/innodb_commit_concurrency_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result
diff --git a/mysql-test/r/innodb_data_file_path_basic.result b/mysql-test/suite/sys_vars/r/innodb_data_file_path_basic.result
index 8904c0dcac4..8904c0dcac4 100644
--- a/mysql-test/r/innodb_data_file_path_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_data_file_path_basic.result
diff --git a/mysql-test/r/innodb_data_home_dir_basic.result b/mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result
index e4bdd79b7c3..e4bdd79b7c3 100644
--- a/mysql-test/r/innodb_data_home_dir_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result
diff --git a/mysql-test/r/innodb_doublewrite_basic.result b/mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result
index 6062399e8b8..6062399e8b8 100644
--- a/mysql-test/r/innodb_doublewrite_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result
diff --git a/mysql-test/r/innodb_fast_shutdown_basic.result b/mysql-test/suite/sys_vars/r/innodb_fast_shutdown_basic.result
index 4b923f4bdd2..4b923f4bdd2 100644
--- a/mysql-test/r/innodb_fast_shutdown_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_fast_shutdown_basic.result
diff --git a/mysql-test/r/innodb_file_io_threads_basic.result b/mysql-test/suite/sys_vars/r/innodb_file_io_threads_basic.result
index 4c1c3ae8d54..4c1c3ae8d54 100644
--- a/mysql-test/r/innodb_file_io_threads_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_file_io_threads_basic.result
diff --git a/mysql-test/r/innodb_file_per_table_basic.result b/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result
index 77595639400..77595639400 100644
--- a/mysql-test/r/innodb_file_per_table_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result
diff --git a/mysql-test/r/innodb_flush_log_at_trx_commit_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
index da9f5ad3994..da9f5ad3994 100644
--- a/mysql-test/r/innodb_flush_log_at_trx_commit_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
diff --git a/mysql-test/r/innodb_flush_method_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result
index 8c8924cdd86..8c8924cdd86 100644
--- a/mysql-test/r/innodb_flush_method_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result
diff --git a/mysql-test/r/innodb_force_recovery_basic.result b/mysql-test/suite/sys_vars/r/innodb_force_recovery_basic.result
index d3dcb525c7f..d3dcb525c7f 100644
--- a/mysql-test/r/innodb_force_recovery_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_force_recovery_basic.result
diff --git a/mysql-test/r/innodb_lock_wait_timeout_basic.result b/mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result
index ce46861b760..ce46861b760 100644
--- a/mysql-test/r/innodb_lock_wait_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result
diff --git a/mysql-test/r/innodb_locks_unsafe_for_binlog_basic.result b/mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result
index a5967d28913..a5967d28913 100644
--- a/mysql-test/r/innodb_locks_unsafe_for_binlog_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result
diff --git a/mysql-test/r/innodb_log_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_buffer_size_basic.result
index d926addd1bd..d926addd1bd 100644
--- a/mysql-test/r/innodb_log_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_log_buffer_size_basic.result
diff --git a/mysql-test/r/innodb_log_file_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_file_size_basic.result
index 119e95df1e1..119e95df1e1 100644
--- a/mysql-test/r/innodb_log_file_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_log_file_size_basic.result
diff --git a/mysql-test/r/innodb_log_files_in_group_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_files_in_group_basic.result
index 1191ef010f8..1191ef010f8 100644
--- a/mysql-test/r/innodb_log_files_in_group_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_log_files_in_group_basic.result
diff --git a/mysql-test/r/innodb_log_group_home_dir_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_group_home_dir_basic.result
index c7fbd2d958f..c7fbd2d958f 100644
--- a/mysql-test/r/innodb_log_group_home_dir_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_log_group_home_dir_basic.result
diff --git a/mysql-test/r/innodb_max_dirty_pages_pct_basic.result b/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result
index 6c52f79f9ad..6c52f79f9ad 100644
--- a/mysql-test/r/innodb_max_dirty_pages_pct_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result
diff --git a/mysql-test/r/innodb_max_dirty_pages_pct_func.result b/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_func.result
index d46c0d4a70a..d46c0d4a70a 100644
--- a/mysql-test/r/innodb_max_dirty_pages_pct_func.result
+++ b/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_func.result
diff --git a/mysql-test/r/innodb_mirrored_log_groups_basic.result b/mysql-test/suite/sys_vars/r/innodb_mirrored_log_groups_basic.result
index 1645d8163ae..1645d8163ae 100644
--- a/mysql-test/r/innodb_mirrored_log_groups_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_mirrored_log_groups_basic.result
diff --git a/mysql-test/r/innodb_open_files_basic.result b/mysql-test/suite/sys_vars/r/innodb_open_files_basic.result
index eac2234270a..eac2234270a 100644
--- a/mysql-test/r/innodb_open_files_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_open_files_basic.result
diff --git a/mysql-test/r/innodb_rollback_on_timeout_basic.result b/mysql-test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result
index 6887166fae6..6887166fae6 100644
--- a/mysql-test/r/innodb_rollback_on_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result
diff --git a/mysql-test/r/innodb_support_xa_basic.result b/mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result
index dcd6f498d56..dcd6f498d56 100644
--- a/mysql-test/r/innodb_support_xa_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result
diff --git a/mysql-test/r/innodb_support_xa_func.result b/mysql-test/suite/sys_vars/r/innodb_support_xa_func.result
index 9036794d636..9036794d636 100644
--- a/mysql-test/r/innodb_support_xa_func.result
+++ b/mysql-test/suite/sys_vars/r/innodb_support_xa_func.result
diff --git a/mysql-test/r/innodb_table_locks_basic.result b/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result
index 14aa995273b..14aa995273b 100644
--- a/mysql-test/r/innodb_table_locks_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result
diff --git a/mysql-test/r/innodb_table_locks_func.result b/mysql-test/suite/sys_vars/r/innodb_table_locks_func.result
index 824d196d295..824d196d295 100644
--- a/mysql-test/r/innodb_table_locks_func.result
+++ b/mysql-test/suite/sys_vars/r/innodb_table_locks_func.result
diff --git a/mysql-test/r/innodb_thread_concurrency_basic.result b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result
index 65a79fecd97..65a79fecd97 100644
--- a/mysql-test/r/innodb_thread_concurrency_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result
diff --git a/mysql-test/r/innodb_thread_sleep_delay_basic.result b/mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result
index 979bfd930ca..979bfd930ca 100644
--- a/mysql-test/r/innodb_thread_sleep_delay_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result
diff --git a/mysql-test/r/insert_id_basic.result b/mysql-test/suite/sys_vars/r/insert_id_basic.result
index 47dd759ff44..47dd759ff44 100644
--- a/mysql-test/r/insert_id_basic.result
+++ b/mysql-test/suite/sys_vars/r/insert_id_basic.result
diff --git a/mysql-test/r/insert_id_func.result b/mysql-test/suite/sys_vars/r/insert_id_func.result
index f03b3ea4851..f03b3ea4851 100644
--- a/mysql-test/r/insert_id_func.result
+++ b/mysql-test/suite/sys_vars/r/insert_id_func.result
diff --git a/mysql-test/r/interactive_timeout_basic.result b/mysql-test/suite/sys_vars/r/interactive_timeout_basic.result
index 0777596db07..0777596db07 100644
--- a/mysql-test/r/interactive_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/interactive_timeout_basic.result
diff --git a/mysql-test/r/interactive_timeout_func.result b/mysql-test/suite/sys_vars/r/interactive_timeout_func.result
index b97f7c90908..b97f7c90908 100644
--- a/mysql-test/r/interactive_timeout_func.result
+++ b/mysql-test/suite/sys_vars/r/interactive_timeout_func.result
diff --git a/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result b/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result
index fc3061d2f59..e3016a2b22c 100644
--- a/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result
@@ -42,6 +42,8 @@ SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
 65536
 SET @@global.join_buffer_size = 4294967295;
+Warnings:
+Warning	1292	Truncated incorrect join_buffer_size value: '4294967295'
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
 4294963200
@@ -58,6 +60,8 @@ SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
 65536
 SET @@session.join_buffer_size = 4294967295;
+Warnings:
+Warning	1292	Truncated incorrect join_buffer_size value: '4294967295'
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
 4294963200
diff --git a/mysql-test/r/keep_files_on_create_basic.result b/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
index f782ee3b078..f782ee3b078 100644
--- a/mysql-test/r/keep_files_on_create_basic.result
+++ b/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
diff --git a/mysql-test/r/key_buffer_size_func.result b/mysql-test/suite/sys_vars/r/key_buffer_size_func.result
index d5b79c260a0..d5b79c260a0 100644
--- a/mysql-test/r/key_buffer_size_func.result
+++ b/mysql-test/suite/sys_vars/r/key_buffer_size_func.result
diff --git a/mysql-test/r/last_insert_id_func.result b/mysql-test/suite/sys_vars/r/last_insert_id_func.result
index 2f07aeeec05..2f07aeeec05 100644
--- a/mysql-test/r/last_insert_id_func.result
+++ b/mysql-test/suite/sys_vars/r/last_insert_id_func.result
diff --git a/mysql-test/r/lc_time_names_basic.result b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result
index 36f3c45f0da..36f3c45f0da 100644
--- a/mysql-test/r/lc_time_names_basic.result
+++ b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result
diff --git a/mysql-test/r/lc_time_names_func.result b/mysql-test/suite/sys_vars/r/lc_time_names_func.result
index 703aa65a6be..703aa65a6be 100644
--- a/mysql-test/r/lc_time_names_func.result
+++ b/mysql-test/suite/sys_vars/r/lc_time_names_func.result
diff --git a/mysql-test/r/license_basic.result b/mysql-test/suite/sys_vars/r/license_basic.result
index 1f92e595020..1f92e595020 100644
--- a/mysql-test/r/license_basic.result
+++ b/mysql-test/suite/sys_vars/r/license_basic.result
diff --git a/mysql-test/r/local_infile_basic.result b/mysql-test/suite/sys_vars/r/local_infile_basic.result
index 5f4c215719a..5f4c215719a 100644
--- a/mysql-test/r/local_infile_basic.result
+++ b/mysql-test/suite/sys_vars/r/local_infile_basic.result
diff --git a/mysql-test/r/local_infile_func.result b/mysql-test/suite/sys_vars/r/local_infile_func.result
index 66a1e5544fb..66a1e5544fb 100644
--- a/mysql-test/r/local_infile_func.result
+++ b/mysql-test/suite/sys_vars/r/local_infile_func.result
diff --git a/mysql-test/r/log_basic.result b/mysql-test/suite/sys_vars/r/log_basic.result
index 18a12b72437..18a12b72437 100644
--- a/mysql-test/r/log_basic.result
+++ b/mysql-test/suite/sys_vars/r/log_basic.result
diff --git a/mysql-test/r/log_bin_trust_function_creators_basic.result b/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result
index 40dc0e217c4..40dc0e217c4 100644
--- a/mysql-test/r/log_bin_trust_function_creators_basic.result
+++ b/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result
diff --git a/mysql-test/r/log_bin_trust_function_creators_func.result b/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_func.result
index 33443df5ae4..33443df5ae4 100644
--- a/mysql-test/r/log_bin_trust_function_creators_func.result
+++ b/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_func.result
diff --git a/mysql-test/r/log_bin_trust_routine_creators_basic.result b/mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result
index cfcbcddfca3..cfcbcddfca3 100644
--- a/mysql-test/r/log_bin_trust_routine_creators_basic.result
+++ b/mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result
diff --git a/mysql-test/r/log_output_basic.result b/mysql-test/suite/sys_vars/r/log_output_basic.result
index 481d5862074..481d5862074 100644
--- a/mysql-test/r/log_output_basic.result
+++ b/mysql-test/suite/sys_vars/r/log_output_basic.result
diff --git a/mysql-test/r/log_output_func.result b/mysql-test/suite/sys_vars/r/log_output_func.result
index 060f930a161..060f930a161 100644
--- a/mysql-test/r/log_output_func.result
+++ b/mysql-test/suite/sys_vars/r/log_output_func.result
diff --git a/mysql-test/r/log_queries_not_using_indexes_basic.result b/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result
index b19b11a4209..b19b11a4209 100644
--- a/mysql-test/r/log_queries_not_using_indexes_basic.result
+++ b/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result
diff --git a/mysql-test/suite/sys_vars/r/log_warnings_basic_32.result b/mysql-test/suite/sys_vars/r/log_warnings_basic_32.result
index 702e95b1383..900bb487706 100644
--- a/mysql-test/suite/sys_vars/r/log_warnings_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/log_warnings_basic_32.result
@@ -71,7 +71,7 @@ SELECT @@session.log_warnings;
 '#------------------FN_DYNVARS_067_05-----------------------#'
 SET @@global.log_warnings = 100000000000;
 Warnings:
-Warning	1292	Truncated incorrect log-warnings value: '100000000000'
+Warning	1292	Truncated incorrect log_warnings value: '100000000000'
 SELECT @@global.log_warnings;
 @@global.log_warnings
 4294967295
@@ -91,7 +91,7 @@ SELECT @@global.log_warnings;
 0
 SET @@session.log_warnings = 100000000000;
 Warnings:
-Warning	1292	Truncated incorrect log-warnings value: '100000000000'
+Warning	1292	Truncated incorrect log_warnings value: '100000000000'
 SELECT @@session.log_warnings;
 @@session.log_warnings
 4294967295
diff --git a/mysql-test/r/long_query_time_basic.result b/mysql-test/suite/sys_vars/r/long_query_time_basic.result
index b44500dc1e2..b44500dc1e2 100644
--- a/mysql-test/r/long_query_time_basic.result
+++ b/mysql-test/suite/sys_vars/r/long_query_time_basic.result
diff --git a/mysql-test/r/low_priority_updates_basic.result b/mysql-test/suite/sys_vars/r/low_priority_updates_basic.result
index 87b30814837..87b30814837 100644
--- a/mysql-test/r/low_priority_updates_basic.result
+++ b/mysql-test/suite/sys_vars/r/low_priority_updates_basic.result
diff --git a/mysql-test/r/max_allowed_packet_basic.result b/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result
index 0745d5a36e1..0745d5a36e1 100644
--- a/mysql-test/r/max_allowed_packet_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result
diff --git a/mysql-test/r/max_allowed_packet_func.result b/mysql-test/suite/sys_vars/r/max_allowed_packet_func.result
index 0d682b65aea..0d682b65aea 100644
--- a/mysql-test/r/max_allowed_packet_func.result
+++ b/mysql-test/suite/sys_vars/r/max_allowed_packet_func.result
diff --git a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result
index 1dbeb50ff90..a594295c0f5 100644
--- a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result
@@ -1,7 +1,7 @@
 SET @start_value = @@global.max_binlog_cache_size;
 SELECT @start_value;
 @start_value
-4294967295
+4294963200
 '#--------------------FN_DYNVARS_072_01------------------------#'
 SET @@global.max_binlog_cache_size = 5000;
 SET @@global.max_binlog_cache_size = DEFAULT;
diff --git a/mysql-test/r/max_binlog_cache_size_func.result b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_func.result
index 50c9e8e935d..50c9e8e935d 100644
--- a/mysql-test/r/max_binlog_cache_size_func.result
+++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_func.result
diff --git a/mysql-test/r/max_binlog_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result
index 291b687f76c..291b687f76c 100644
--- a/mysql-test/r/max_binlog_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result
diff --git a/mysql-test/r/max_connections_basic.result b/mysql-test/suite/sys_vars/r/max_connections_basic.result
index ccedff01c54..ccedff01c54 100644
--- a/mysql-test/r/max_connections_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_connections_basic.result
diff --git a/mysql-test/r/max_delayed_threads_basic.result b/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
index e0b2a3ee1cd..e0b2a3ee1cd 100644
--- a/mysql-test/r/max_delayed_threads_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
diff --git a/mysql-test/r/max_error_count_basic.result b/mysql-test/suite/sys_vars/r/max_error_count_basic.result
index 2046a5e9dfa..2046a5e9dfa 100644
--- a/mysql-test/r/max_error_count_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_error_count_basic.result
diff --git a/mysql-test/r/max_insert_delayed_threads_basic.result b/mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
index 31c1fcec396..31c1fcec396 100644
--- a/mysql-test/r/max_insert_delayed_threads_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
diff --git a/mysql-test/r/max_join_size_func.result b/mysql-test/suite/sys_vars/r/max_join_size_func.result
index bf535579433..bf535579433 100644
--- a/mysql-test/r/max_join_size_func.result
+++ b/mysql-test/suite/sys_vars/r/max_join_size_func.result
diff --git a/mysql-test/r/max_length_for_sort_data_basic.result b/mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result
index 3edd3e86262..3edd3e86262 100644
--- a/mysql-test/r/max_length_for_sort_data_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result
diff --git a/mysql-test/r/max_prepared_stmt_count_basic.result b/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result
index ebc7da8c7f8..ebc7da8c7f8 100644
--- a/mysql-test/r/max_prepared_stmt_count_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result
diff --git a/mysql-test/r/max_prepared_stmt_count_func.result b/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_func.result
index 562ef63f811..562ef63f811 100644
--- a/mysql-test/r/max_prepared_stmt_count_func.result
+++ b/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_func.result
diff --git a/mysql-test/r/max_relay_log_size_basic.result b/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result
index c0042f497ad..c0042f497ad 100644
--- a/mysql-test/r/max_relay_log_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result
diff --git a/mysql-test/r/max_seeks_for_key_func.result b/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result
index 5a2441276ec..5a2441276ec 100644
--- a/mysql-test/r/max_seeks_for_key_func.result
+++ b/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result
diff --git a/mysql-test/r/max_sort_length_basic.result b/mysql-test/suite/sys_vars/r/max_sort_length_basic.result
index 73dd31ea4e7..73dd31ea4e7 100644
--- a/mysql-test/r/max_sort_length_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_sort_length_basic.result
diff --git a/mysql-test/r/max_sort_length_func.result b/mysql-test/suite/sys_vars/r/max_sort_length_func.result
index 9254f1fadd7..9254f1fadd7 100644
--- a/mysql-test/r/max_sort_length_func.result
+++ b/mysql-test/suite/sys_vars/r/max_sort_length_func.result
diff --git a/mysql-test/r/max_sp_recursion_depth_basic.result b/mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result
index 8c79f3c5fc7..8c79f3c5fc7 100644
--- a/mysql-test/r/max_sp_recursion_depth_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result
diff --git a/mysql-test/r/max_sp_recursion_depth_func.result b/mysql-test/suite/sys_vars/r/max_sp_recursion_depth_func.result
index 59d88440f53..59d88440f53 100644
--- a/mysql-test/r/max_sp_recursion_depth_func.result
+++ b/mysql-test/suite/sys_vars/r/max_sp_recursion_depth_func.result
diff --git a/mysql-test/r/max_user_connections_basic.result b/mysql-test/suite/sys_vars/r/max_user_connections_basic.result
index 3250b2f03ea..3250b2f03ea 100644
--- a/mysql-test/r/max_user_connections_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_user_connections_basic.result
diff --git a/mysql-test/r/max_user_connections_func.result b/mysql-test/suite/sys_vars/r/max_user_connections_func.result
index 2ff2ac82ce7..2ff2ac82ce7 100644
--- a/mysql-test/r/max_user_connections_func.result
+++ b/mysql-test/suite/sys_vars/r/max_user_connections_func.result
diff --git a/mysql-test/r/myisam_data_pointer_size_basic.result b/mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result
index d2b0bebe029..d2b0bebe029 100644
--- a/mysql-test/r/myisam_data_pointer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result
diff --git a/mysql-test/r/myisam_data_pointer_size_func.result b/mysql-test/suite/sys_vars/r/myisam_data_pointer_size_func.result
index 82d9a7dad66..82d9a7dad66 100644
--- a/mysql-test/r/myisam_data_pointer_size_func.result
+++ b/mysql-test/suite/sys_vars/r/myisam_data_pointer_size_func.result
diff --git a/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result b/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result
index 64d1168685c..7467537eaba 100644
--- a/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result
@@ -1,7 +1,7 @@
 SET @start_global_value = @@global.myisam_max_sort_file_size;
 SELECT @start_global_value;
 @start_global_value
-2147483647
+2146435072
 '#--------------------FN_DYNVARS_094_01-------------------------#'
 SET @@global.myisam_max_sort_file_size = 500000;
 SET @@global.myisam_max_sort_file_size = DEFAULT;
diff --git a/mysql-test/r/myisam_sort_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result
index 74d2fb3ec86..74d2fb3ec86 100644
--- a/mysql-test/r/myisam_sort_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result
diff --git a/mysql-test/r/myisam_stats_method_basic.result b/mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result
index 3272ef6e538..3272ef6e538 100644
--- a/mysql-test/r/myisam_stats_method_basic.result
+++ b/mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result
diff --git a/mysql-test/r/myisam_stats_method_func.result b/mysql-test/suite/sys_vars/r/myisam_stats_method_func.result
index 55d91b7417d..55d91b7417d 100644
--- a/mysql-test/r/myisam_stats_method_func.result
+++ b/mysql-test/suite/sys_vars/r/myisam_stats_method_func.result
diff --git a/mysql-test/r/myisam_use_mmap_basic.result b/mysql-test/suite/sys_vars/r/myisam_use_mmap_basic.result
index c0f92acb983..c0f92acb983 100644
--- a/mysql-test/r/myisam_use_mmap_basic.result
+++ b/mysql-test/suite/sys_vars/r/myisam_use_mmap_basic.result
diff --git a/mysql-test/r/ndb_log_update_as_write_basic.result b/mysql-test/suite/sys_vars/r/ndb_log_update_as_write_basic.result
index 6353fba2b7c..6353fba2b7c 100644
--- a/mysql-test/r/ndb_log_update_as_write_basic.result
+++ b/mysql-test/suite/sys_vars/r/ndb_log_update_as_write_basic.result
diff --git a/mysql-test/r/ndb_log_updated_only_basic.result b/mysql-test/suite/sys_vars/r/ndb_log_updated_only_basic.result
index 38abb7cc263..38abb7cc263 100644
--- a/mysql-test/r/ndb_log_updated_only_basic.result
+++ b/mysql-test/suite/sys_vars/r/ndb_log_updated_only_basic.result
diff --git a/mysql-test/r/net_buffer_length_basic.result b/mysql-test/suite/sys_vars/r/net_buffer_length_basic.result
index be7e9082332..be7e9082332 100644
--- a/mysql-test/r/net_buffer_length_basic.result
+++ b/mysql-test/suite/sys_vars/r/net_buffer_length_basic.result
diff --git a/mysql-test/r/net_read_timeout_basic.result b/mysql-test/suite/sys_vars/r/net_read_timeout_basic.result
index 90a6ef72718..90a6ef72718 100644
--- a/mysql-test/r/net_read_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/net_read_timeout_basic.result
diff --git a/mysql-test/r/net_write_timeout_basic.result b/mysql-test/suite/sys_vars/r/net_write_timeout_basic.result
index 35a2cf069e3..35a2cf069e3 100644
--- a/mysql-test/r/net_write_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/net_write_timeout_basic.result
diff --git a/mysql-test/r/new_basic.result b/mysql-test/suite/sys_vars/r/new_basic.result
index b36e540ddd9..b36e540ddd9 100644
--- a/mysql-test/r/new_basic.result
+++ b/mysql-test/suite/sys_vars/r/new_basic.result
diff --git a/mysql-test/r/old_passwords_basic.result b/mysql-test/suite/sys_vars/r/old_passwords_basic.result
index ecf23ab302b..ecf23ab302b 100644
--- a/mysql-test/r/old_passwords_basic.result
+++ b/mysql-test/suite/sys_vars/r/old_passwords_basic.result
diff --git a/mysql-test/r/old_passwords_func.result b/mysql-test/suite/sys_vars/r/old_passwords_func.result
index eebee9f4852..eebee9f4852 100644
--- a/mysql-test/r/old_passwords_func.result
+++ b/mysql-test/suite/sys_vars/r/old_passwords_func.result
diff --git a/mysql-test/r/optimizer_prune_level_basic.result b/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result
index 46fe70c40d0..46fe70c40d0 100644
--- a/mysql-test/r/optimizer_prune_level_basic.result
+++ b/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result
diff --git a/mysql-test/r/optimizer_search_depth_basic.result b/mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result
index 9c26339839e..9c26339839e 100644
--- a/mysql-test/r/optimizer_search_depth_basic.result
+++ b/mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result
diff --git a/mysql-test/r/preload_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result
index 775b670d3bc..775b670d3bc 100644
--- a/mysql-test/r/preload_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result
diff --git a/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
index 3b7f06c8f81..32b9371977c 100644
--- a/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
@@ -36,10 +36,14 @@ SELECT @@global.query_alloc_block_size;
 @@global.query_alloc_block_size
 1024
 SET @@global.query_alloc_block_size = 4294967295;
+Warnings:
+Warning	1292	Truncated incorrect query_alloc_block_size value: '4294967295'
 SELECT @@global.query_alloc_block_size;
 @@global.query_alloc_block_size
 4294966272
 SET @@global.query_alloc_block_size = 4294967294;
+Warnings:
+Warning	1292	Truncated incorrect query_alloc_block_size value: '4294967294'
 SELECT @@global.query_alloc_block_size;
 @@global.query_alloc_block_size
 4294966272
@@ -58,10 +62,14 @@ SELECT @@session.query_alloc_block_size;
 @@session.query_alloc_block_size
 1024
 SET @@session.query_alloc_block_size = 4294967295;
+Warnings:
+Warning	1292	Truncated incorrect query_alloc_block_size value: '4294967295'
 SELECT @@session.query_alloc_block_size;
 @@session.query_alloc_block_size
 4294966272
 SET @@session.query_alloc_block_size = 4294967294;
+Warnings:
+Warning	1292	Truncated incorrect query_alloc_block_size value: '4294967294'
 SELECT @@session.query_alloc_block_size;
 @@session.query_alloc_block_size
 4294966272
diff --git a/mysql-test/r/query_cache_limit_func.result b/mysql-test/suite/sys_vars/r/query_cache_limit_func.result
index bbbb273428a..bbbb273428a 100644
--- a/mysql-test/r/query_cache_limit_func.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_limit_func.result
diff --git a/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result b/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
index 1af70b3af84..1793726b2f1 100644
--- a/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
@@ -1,7 +1,4 @@
 SET @start_value = @@global.query_cache_size;
-SELECT @start_value;
-@start_value
-0
 '#--------------------FN_DYNVARS_133_01------------------------#'
 SET @@global.query_cache_size = 99;
 SET @@global.query_cache_size = DEFAULT;
@@ -10,8 +7,8 @@ SELECT @@global.query_cache_size;
 0
 '#---------------------FN_DYNVARS_133_02-------------------------#'
 SET @@global.query_cache_size = @start_value;
-SELECT @@global.query_cache_size = 0;
-@@global.query_cache_size = 0
+SELECT @@global.query_cache_size = @start_value;
+@@global.query_cache_size = @start_value
 1
 '#--------------------FN_DYNVARS_133_03------------------------#'
 SET @@global.query_cache_size = 0;
@@ -133,6 +130,3 @@ ERROR 42S02: Unknown table 'global' in field list
 SELECT query_cache_size = @@session.query_cache_size;
 ERROR 42S22: Unknown column 'query_cache_size' in 'field list'
 SET @@global.query_cache_size = @start_value;
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
diff --git a/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result b/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result
index 0d67eec1ccc..0cc508b169e 100644
--- a/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result
@@ -1,7 +1,4 @@
 SET @start_value = @@global.query_cache_size;
-SELECT @start_value;
-@start_value
-0
 '#--------------------FN_DYNVARS_133_01------------------------#'
 SET @@global.query_cache_size = 99;
 SET @@global.query_cache_size = DEFAULT;
@@ -10,8 +7,8 @@ SELECT @@global.query_cache_size;
 0
 '#---------------------FN_DYNVARS_133_02-------------------------#'
 SET @@global.query_cache_size = @start_value;
-SELECT @@global.query_cache_size = 0;
-@@global.query_cache_size = 0
+SELECT @@global.query_cache_size = @start_value;
+@@global.query_cache_size = @start_value
 1
 '#--------------------FN_DYNVARS_133_03------------------------#'
 SET @@global.query_cache_size = 0;
@@ -129,6 +126,3 @@ ERROR 42S02: Unknown table 'global' in field list
 SELECT query_cache_size = @@session.query_cache_size;
 ERROR 42S22: Unknown column 'query_cache_size' in 'field list'
 SET @@global.query_cache_size = @start_value;
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
diff --git a/mysql-test/r/query_cache_type_basic.result b/mysql-test/suite/sys_vars/r/query_cache_type_basic.result
index 101853daa80..101853daa80 100644
--- a/mysql-test/r/query_cache_type_basic.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_type_basic.result
diff --git a/mysql-test/r/query_cache_type_func.result b/mysql-test/suite/sys_vars/r/query_cache_type_func.result
index af121244572..af121244572 100644
--- a/mysql-test/r/query_cache_type_func.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_type_func.result
diff --git a/mysql-test/r/query_cache_wlock_invalidate_basic.result b/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result
index bff07741656..bff07741656 100644
--- a/mysql-test/r/query_cache_wlock_invalidate_basic.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result
diff --git a/mysql-test/r/query_cache_wlock_invalidate_func.result b/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result
index 71ee11a5235..71ee11a5235 100644
--- a/mysql-test/r/query_cache_wlock_invalidate_func.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result
diff --git a/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result b/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result
index cd5f1727d41..a16c56f95c5 100644
--- a/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result
@@ -35,10 +35,6 @@ SET @@global.query_prealloc_size   = 8192;
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
 8192
-SET @@global.query_prealloc_size   = 4294967295;
-SELECT @@global.query_prealloc_size  ;
-@@global.query_prealloc_size
-4294966272
 SET @@global.query_prealloc_size   = 655354;
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
@@ -48,10 +44,6 @@ SET @@session.query_prealloc_size   = 8192;
 SELECT @@session.query_prealloc_size  ;
 @@session.query_prealloc_size
 8192
-SET @@session.query_prealloc_size   = 4294967295;
-SELECT @@session.query_prealloc_size  ;
-@@session.query_prealloc_size
-4294966272
 SET @@session.query_prealloc_size   = 655345;
 SELECT @@session.query_prealloc_size  ;
 @@session.query_prealloc_size
@@ -63,50 +55,32 @@ Warning	1292	Truncated incorrect query_prealloc_size value: '0'
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
 8192
-SET @@global.query_prealloc_size   = -1024;
-Warnings:
-Warning	1292	Truncated incorrect query_prealloc_size value: '0'
-SELECT @@global.query_prealloc_size  ;
-@@global.query_prealloc_size
-8192
-SET @@global.query_prealloc_size   = 429496729533;
-Warnings:
-Warning	1292	Truncated incorrect query_prealloc_size value: '429496729533'
-SELECT @@global.query_prealloc_size  ;
-@@global.query_prealloc_size
-4294966272
 SET @@global.query_prealloc_size   = 65530.34.;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
-4294966272
+8192
 SET @@global.query_prealloc_size   = test;
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
-4294966272
+8192
 SET @@global.query_prealloc_size   = "test";
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
-4294966272
+8192
 SET @@global.query_prealloc_size   = 'test';
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
-4294966272
+8192
 SET @@global.query_prealloc_size   = ON;
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
-4294966272
-SET @@session.query_prealloc_size   = 0;
-Warnings:
-Warning	1292	Truncated incorrect query_prealloc_size value: '0'
-SELECT @@session.query_prealloc_size  ;
-@@session.query_prealloc_size
 8192
-SET @@session.query_prealloc_size   = -2;
+SET @@session.query_prealloc_size   = 0;
 Warnings:
 Warning	1292	Truncated incorrect query_prealloc_size value: '0'
 SELECT @@session.query_prealloc_size  ;
diff --git a/mysql-test/r/query_prealloc_size_func.result b/mysql-test/suite/sys_vars/r/query_prealloc_size_func.result
index 4f7a8d18f32..4f7a8d18f32 100644
--- a/mysql-test/r/query_prealloc_size_func.result
+++ b/mysql-test/suite/sys_vars/r/query_prealloc_size_func.result
diff --git a/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result
index 93441448d90..95e22dfcf14 100644
--- a/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result
@@ -39,10 +39,14 @@ SELECT @@global.range_alloc_block_size;
 4096
 'Bug# 34877: Invalid Values are coming in variable on assigning valid values';
 SET @@global.range_alloc_block_size = 4294967295;
+Warnings:
+Warning	1292	Truncated incorrect range_alloc_block_size value: '4294967295'
 SELECT @@global.range_alloc_block_size;
 @@global.range_alloc_block_size
 4294966272
 SET @@global.range_alloc_block_size = 4294967294;
+Warnings:
+Warning	1292	Truncated incorrect range_alloc_block_size value: '4294967294'
 SELECT @@global.range_alloc_block_size;
 @@global.range_alloc_block_size
 4294966272
@@ -55,10 +59,14 @@ SELECT @@session.range_alloc_block_size;
 @@session.range_alloc_block_size
 4096
 SET @@session.range_alloc_block_size = 4294967295;
+Warnings:
+Warning	1292	Truncated incorrect range_alloc_block_size value: '4294967295'
 SELECT @@session.range_alloc_block_size;
 @@session.range_alloc_block_size
 4294966272
 SET @@session.range_alloc_block_size = 4294967294;
+Warnings:
+Warning	1292	Truncated incorrect range_alloc_block_size value: '4294967294'
 SELECT @@session.range_alloc_block_size;
 @@session.range_alloc_block_size
 4294966272
diff --git a/mysql-test/r/read_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/read_buffer_size_basic.result
index 3c007dc1515..3c007dc1515 100644
--- a/mysql-test/r/read_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/read_buffer_size_basic.result
diff --git a/mysql-test/r/read_only_basic.result b/mysql-test/suite/sys_vars/r/read_only_basic.result
index ac153fa337c..ac153fa337c 100644
--- a/mysql-test/r/read_only_basic.result
+++ b/mysql-test/suite/sys_vars/r/read_only_basic.result
diff --git a/mysql-test/r/read_only_func.result b/mysql-test/suite/sys_vars/r/read_only_func.result
index 35b42d468d6..35b42d468d6 100644
--- a/mysql-test/r/read_only_func.result
+++ b/mysql-test/suite/sys_vars/r/read_only_func.result
diff --git a/mysql-test/r/read_rnd_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result
index c6440ac032e..c6440ac032e 100644
--- a/mysql-test/r/read_rnd_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result
diff --git a/mysql-test/r/relay_log_purge_basic.result b/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result
index 6f938c5265f..6f938c5265f 100644
--- a/mysql-test/r/relay_log_purge_basic.result
+++ b/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result
diff --git a/mysql-test/r/rpl_init_slave_func.result b/mysql-test/suite/sys_vars/r/rpl_init_slave_func.result
index 0d1f4d483d8..0d1f4d483d8 100644
--- a/mysql-test/r/rpl_init_slave_func.result
+++ b/mysql-test/suite/sys_vars/r/rpl_init_slave_func.result
diff --git a/mysql-test/r/rpl_max_binlog_size_func.result b/mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result
index 0d0a1ae03c4..0d0a1ae03c4 100644
--- a/mysql-test/r/rpl_max_binlog_size_func.result
+++ b/mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result
diff --git a/mysql-test/r/secure_auth_basic.result b/mysql-test/suite/sys_vars/r/secure_auth_basic.result
index b8a903ba420..b8a903ba420 100644
--- a/mysql-test/r/secure_auth_basic.result
+++ b/mysql-test/suite/sys_vars/r/secure_auth_basic.result
diff --git a/mysql-test/r/secure_auth_func.result b/mysql-test/suite/sys_vars/r/secure_auth_func.result
index f7e24e3f043..f7e24e3f043 100644
--- a/mysql-test/r/secure_auth_func.result
+++ b/mysql-test/suite/sys_vars/r/secure_auth_func.result
diff --git a/mysql-test/r/slave_allow_batching_basic.result b/mysql-test/suite/sys_vars/r/slave_allow_batching_basic.result
index 186cfbc8f0f..186cfbc8f0f 100644
--- a/mysql-test/r/slave_allow_batching_basic.result
+++ b/mysql-test/suite/sys_vars/r/slave_allow_batching_basic.result
diff --git a/mysql-test/r/slave_compressed_protocol_basic.result b/mysql-test/suite/sys_vars/r/slave_compressed_protocol_basic.result
index 3f2d9d2fb3f..3f2d9d2fb3f 100644
--- a/mysql-test/r/slave_compressed_protocol_basic.result
+++ b/mysql-test/suite/sys_vars/r/slave_compressed_protocol_basic.result
diff --git a/mysql-test/r/slave_exec_mode_basic.result b/mysql-test/suite/sys_vars/r/slave_exec_mode_basic.result
index aeb73196733..aeb73196733 100644
--- a/mysql-test/r/slave_exec_mode_basic.result
+++ b/mysql-test/suite/sys_vars/r/slave_exec_mode_basic.result
diff --git a/mysql-test/r/slave_net_timeout_basic.result b/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result
index 7903d7f8215..7903d7f8215 100644
--- a/mysql-test/r/slave_net_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result
diff --git a/mysql-test/r/slow_launch_time_basic.result b/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result
index c42942fba1a..c42942fba1a 100644
--- a/mysql-test/r/slow_launch_time_basic.result
+++ b/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result
diff --git a/mysql-test/r/slow_launch_time_func.result b/mysql-test/suite/sys_vars/r/slow_launch_time_func.result
index 7665166ff29..7665166ff29 100644
--- a/mysql-test/r/slow_launch_time_func.result
+++ b/mysql-test/suite/sys_vars/r/slow_launch_time_func.result
diff --git a/mysql-test/r/slow_query_log_basic.result b/mysql-test/suite/sys_vars/r/slow_query_log_basic.result
index 716309aeaff..716309aeaff 100644
--- a/mysql-test/r/slow_query_log_basic.result
+++ b/mysql-test/suite/sys_vars/r/slow_query_log_basic.result
diff --git a/mysql-test/r/slow_query_log_file_basic.result b/mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result
index 925f940a5c4..925f940a5c4 100644
--- a/mysql-test/r/slow_query_log_file_basic.result
+++ b/mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result
diff --git a/mysql-test/r/slow_query_log_file_func.result b/mysql-test/suite/sys_vars/r/slow_query_log_file_func.result
index 201b33c8edb..201b33c8edb 100644
--- a/mysql-test/r/slow_query_log_file_func.result
+++ b/mysql-test/suite/sys_vars/r/slow_query_log_file_func.result
diff --git a/mysql-test/r/slow_query_log_func.result b/mysql-test/suite/sys_vars/r/slow_query_log_func.result
index 83edb4c187e..83edb4c187e 100644
--- a/mysql-test/r/slow_query_log_func.result
+++ b/mysql-test/suite/sys_vars/r/slow_query_log_func.result
diff --git a/mysql-test/r/sql_auto_is_null_basic.result b/mysql-test/suite/sys_vars/r/sql_auto_is_null_basic.result
index b3a3eecd93a..b3a3eecd93a 100644
--- a/mysql-test/r/sql_auto_is_null_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_auto_is_null_basic.result
diff --git a/mysql-test/r/sql_big_selects_basic.result b/mysql-test/suite/sys_vars/r/sql_big_selects_basic.result
index 1171382380d..1171382380d 100644
--- a/mysql-test/r/sql_big_selects_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_big_selects_basic.result
diff --git a/mysql-test/r/sql_big_selects_func.result b/mysql-test/suite/sys_vars/r/sql_big_selects_func.result
index fc7e1f32e00..fc7e1f32e00 100644
--- a/mysql-test/r/sql_big_selects_func.result
+++ b/mysql-test/suite/sys_vars/r/sql_big_selects_func.result
diff --git a/mysql-test/r/sql_big_tables_basic.result b/mysql-test/suite/sys_vars/r/sql_big_tables_basic.result
index bce14b2aba2..bce14b2aba2 100644
--- a/mysql-test/r/sql_big_tables_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_big_tables_basic.result
diff --git a/mysql-test/r/sql_big_tables_func.result b/mysql-test/suite/sys_vars/r/sql_big_tables_func.result
index 9b707e439ef..9b707e439ef 100644
--- a/mysql-test/r/sql_big_tables_func.result
+++ b/mysql-test/suite/sys_vars/r/sql_big_tables_func.result
diff --git a/mysql-test/r/sql_buffer_result_basic.result b/mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result
index d03b688dbe6..d03b688dbe6 100644
--- a/mysql-test/r/sql_buffer_result_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result
diff --git a/mysql-test/r/sql_buffer_result_func.result b/mysql-test/suite/sys_vars/r/sql_buffer_result_func.result
index 38d7f7ecc0a..38d7f7ecc0a 100644
--- a/mysql-test/r/sql_buffer_result_func.result
+++ b/mysql-test/suite/sys_vars/r/sql_buffer_result_func.result
diff --git a/mysql-test/r/sql_log_bin_basic.result b/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result
index 4e37c2079d6..4e37c2079d6 100644
--- a/mysql-test/r/sql_log_bin_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result
diff --git a/mysql-test/r/sql_log_off_basic.result b/mysql-test/suite/sys_vars/r/sql_log_off_basic.result
index 03846cb6ce8..03846cb6ce8 100644
--- a/mysql-test/r/sql_log_off_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_log_off_basic.result
diff --git a/mysql-test/r/sql_log_off_func.result b/mysql-test/suite/sys_vars/r/sql_log_off_func.result
index e51860534f1..e51860534f1 100644
--- a/mysql-test/r/sql_log_off_func.result
+++ b/mysql-test/suite/sys_vars/r/sql_log_off_func.result
diff --git a/mysql-test/r/sql_low_priority_updates_basic.result b/mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result
index 6a09e6720b3..6a09e6720b3 100644
--- a/mysql-test/r/sql_low_priority_updates_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result
diff --git a/mysql-test/r/sql_low_priority_updates_func.result b/mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result
index f0874ae7414..f0874ae7414 100644
--- a/mysql-test/r/sql_low_priority_updates_func.result
+++ b/mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result
diff --git a/mysql-test/r/sql_max_join_size_func.result b/mysql-test/suite/sys_vars/r/sql_max_join_size_func.result
index 0e406f6611e..0e406f6611e 100644
--- a/mysql-test/r/sql_max_join_size_func.result
+++ b/mysql-test/suite/sys_vars/r/sql_max_join_size_func.result
diff --git a/mysql-test/r/sql_mode_basic.result b/mysql-test/suite/sys_vars/r/sql_mode_basic.result
index 78a9f179824..78a9f179824 100644
--- a/mysql-test/r/sql_mode_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_mode_basic.result
diff --git a/mysql-test/r/sql_mode_func.result b/mysql-test/suite/sys_vars/r/sql_mode_func.result
index dbf0db4e1ad..dbf0db4e1ad 100644
--- a/mysql-test/r/sql_mode_func.result
+++ b/mysql-test/suite/sys_vars/r/sql_mode_func.result
diff --git a/mysql-test/r/sql_notes_basic.result b/mysql-test/suite/sys_vars/r/sql_notes_basic.result
index 5dd792d8ede..5dd792d8ede 100644
--- a/mysql-test/r/sql_notes_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_notes_basic.result
diff --git a/mysql-test/r/sql_notes_func.result b/mysql-test/suite/sys_vars/r/sql_notes_func.result
index 87c4ecb8431..87c4ecb8431 100644
--- a/mysql-test/r/sql_notes_func.result
+++ b/mysql-test/suite/sys_vars/r/sql_notes_func.result
diff --git a/mysql-test/r/sql_quote_show_create_basic.result b/mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result
index 2550f2d1057..2550f2d1057 100644
--- a/mysql-test/r/sql_quote_show_create_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result
diff --git a/mysql-test/r/sql_quote_show_create_func.result b/mysql-test/suite/sys_vars/r/sql_quote_show_create_func.result
index 9c1e751eef2..9c1e751eef2 100644
--- a/mysql-test/r/sql_quote_show_create_func.result
+++ b/mysql-test/suite/sys_vars/r/sql_quote_show_create_func.result
diff --git a/mysql-test/r/sql_safe_updates_basic.result b/mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result
index 539b38bb1fe..539b38bb1fe 100644
--- a/mysql-test/r/sql_safe_updates_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result
diff --git a/mysql-test/r/sql_safe_updates_func.result b/mysql-test/suite/sys_vars/r/sql_safe_updates_func.result
index cf8d613b683..cf8d613b683 100644
--- a/mysql-test/r/sql_safe_updates_func.result
+++ b/mysql-test/suite/sys_vars/r/sql_safe_updates_func.result
diff --git a/mysql-test/r/sql_select_limit_func.result b/mysql-test/suite/sys_vars/r/sql_select_limit_func.result
index 893816e6f0f..893816e6f0f 100644
--- a/mysql-test/r/sql_select_limit_func.result
+++ b/mysql-test/suite/sys_vars/r/sql_select_limit_func.result
diff --git a/mysql-test/r/sql_slave_skip_counter_basic.result b/mysql-test/suite/sys_vars/r/sql_slave_skip_counter_basic.result
index 9ceef325483..9ceef325483 100644
--- a/mysql-test/r/sql_slave_skip_counter_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_slave_skip_counter_basic.result
diff --git a/mysql-test/r/sql_warnings_basic.result b/mysql-test/suite/sys_vars/r/sql_warnings_basic.result
index 46907c0ced8..46907c0ced8 100644
--- a/mysql-test/r/sql_warnings_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_warnings_basic.result
diff --git a/mysql-test/r/sql_warnings_func.result b/mysql-test/suite/sys_vars/r/sql_warnings_func.result
index 8b723cf8be3..8b723cf8be3 100644
--- a/mysql-test/r/sql_warnings_func.result
+++ b/mysql-test/suite/sys_vars/r/sql_warnings_func.result
diff --git a/mysql-test/r/ssl_ca_basic.result b/mysql-test/suite/sys_vars/r/ssl_ca_basic.result
index 618c5558c3e..618c5558c3e 100644
--- a/mysql-test/r/ssl_ca_basic.result
+++ b/mysql-test/suite/sys_vars/r/ssl_ca_basic.result
diff --git a/mysql-test/r/ssl_capath_basic.result b/mysql-test/suite/sys_vars/r/ssl_capath_basic.result
index 3d161392917..3d161392917 100644
--- a/mysql-test/r/ssl_capath_basic.result
+++ b/mysql-test/suite/sys_vars/r/ssl_capath_basic.result
diff --git a/mysql-test/r/ssl_cert_basic.result b/mysql-test/suite/sys_vars/r/ssl_cert_basic.result
index 1571730a653..1571730a653 100644
--- a/mysql-test/r/ssl_cert_basic.result
+++ b/mysql-test/suite/sys_vars/r/ssl_cert_basic.result
diff --git a/mysql-test/r/ssl_cipher_basic.result b/mysql-test/suite/sys_vars/r/ssl_cipher_basic.result
index df0fc8b5aad..df0fc8b5aad 100644
--- a/mysql-test/r/ssl_cipher_basic.result
+++ b/mysql-test/suite/sys_vars/r/ssl_cipher_basic.result
diff --git a/mysql-test/r/ssl_key_basic.result b/mysql-test/suite/sys_vars/r/ssl_key_basic.result
index 0869a2915e3..0869a2915e3 100644
--- a/mysql-test/r/ssl_key_basic.result
+++ b/mysql-test/suite/sys_vars/r/ssl_key_basic.result
diff --git a/mysql-test/r/storage_engine_basic.result b/mysql-test/suite/sys_vars/r/storage_engine_basic.result
index 8d621ac5599..8d621ac5599 100644
--- a/mysql-test/r/storage_engine_basic.result
+++ b/mysql-test/suite/sys_vars/r/storage_engine_basic.result
diff --git a/mysql-test/r/sync_frm_basic.result b/mysql-test/suite/sys_vars/r/sync_frm_basic.result
index 9792307d17f..9792307d17f 100644
--- a/mysql-test/r/sync_frm_basic.result
+++ b/mysql-test/suite/sys_vars/r/sync_frm_basic.result
diff --git a/mysql-test/r/system_time_zone_basic.result b/mysql-test/suite/sys_vars/r/system_time_zone_basic.result
index c398e5bd93b..c398e5bd93b 100644
--- a/mysql-test/r/system_time_zone_basic.result
+++ b/mysql-test/suite/sys_vars/r/system_time_zone_basic.result
diff --git a/mysql-test/r/table_definition_cache_basic.result b/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result
index 5f0e1960358..5f0e1960358 100644
--- a/mysql-test/r/table_definition_cache_basic.result
+++ b/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result
diff --git a/mysql-test/r/table_lock_wait_timeout_basic.result b/mysql-test/suite/sys_vars/r/table_lock_wait_timeout_basic.result
index 13771980188..13771980188 100644
--- a/mysql-test/r/table_lock_wait_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/table_lock_wait_timeout_basic.result
diff --git a/mysql-test/r/table_open_cache_basic.result b/mysql-test/suite/sys_vars/r/table_open_cache_basic.result
index ca02d32386f..ca02d32386f 100644
--- a/mysql-test/r/table_open_cache_basic.result
+++ b/mysql-test/suite/sys_vars/r/table_open_cache_basic.result
diff --git a/mysql-test/r/thread_cache_size_func.result b/mysql-test/suite/sys_vars/r/thread_cache_size_func.result
index f808e28a512..f808e28a512 100644
--- a/mysql-test/r/thread_cache_size_func.result
+++ b/mysql-test/suite/sys_vars/r/thread_cache_size_func.result
diff --git a/mysql-test/r/thread_handling_basic.result b/mysql-test/suite/sys_vars/r/thread_handling_basic.result
index f5a333ac033..f5a333ac033 100644
--- a/mysql-test/r/thread_handling_basic.result
+++ b/mysql-test/suite/sys_vars/r/thread_handling_basic.result
diff --git a/mysql-test/r/time_zone_basic.result b/mysql-test/suite/sys_vars/r/time_zone_basic.result
index e7d419f28b5..e7d419f28b5 100644
--- a/mysql-test/r/time_zone_basic.result
+++ b/mysql-test/suite/sys_vars/r/time_zone_basic.result
diff --git a/mysql-test/r/time_zone_func.result b/mysql-test/suite/sys_vars/r/time_zone_func.result
index 2153a3f58ff..2153a3f58ff 100644
--- a/mysql-test/r/time_zone_func.result
+++ b/mysql-test/suite/sys_vars/r/time_zone_func.result
diff --git a/mysql-test/r/timed_mutexes_basic.result b/mysql-test/suite/sys_vars/r/timed_mutexes_basic.result
index d8bd2cd975f..d8bd2cd975f 100644
--- a/mysql-test/r/timed_mutexes_basic.result
+++ b/mysql-test/suite/sys_vars/r/timed_mutexes_basic.result
diff --git a/mysql-test/suite/sys_vars/r/timestamp_basic_32.result b/mysql-test/suite/sys_vars/r/timestamp_basic_32.result
index cc4f0324c0f..a8be2201e68 100644
--- a/mysql-test/suite/sys_vars/r/timestamp_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/timestamp_basic_32.result
@@ -35,11 +35,6 @@ ERROR 42000: Incorrect argument type to variable 'timestamp'
 SET @@timestamp = 9999999999999999999999;
 ERROR 42000: Incorrect argument type to variable 'timestamp'
 '#----------------------FN_DYNVARS_001_06------------------------#'
-SELECT @@timestamp = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='timestamp';
-@@timestamp = VARIABLE_VALUE
-1
 '#---------------------FN_DYNVARS_001_08-------------------------#'
 SET @@timestamp = OFF;
 ERROR 42000: Incorrect argument type to variable 'timestamp'
diff --git a/mysql-test/suite/sys_vars/r/timestamp_basic_64.result b/mysql-test/suite/sys_vars/r/timestamp_basic_64.result
index df877cd455b..824a3ea5529 100644
--- a/mysql-test/suite/sys_vars/r/timestamp_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/timestamp_basic_64.result
@@ -35,11 +35,6 @@ ERROR 42000: Incorrect argument type to variable 'timestamp'
 SET @@timestamp = 9999999999999999999999;
 ERROR 42000: Incorrect argument type to variable 'timestamp'
 '#----------------------FN_DYNVARS_001_06------------------------#'
-SELECT @@timestamp = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='timestamp';
-@@timestamp = VARIABLE_VALUE
-1
 '#---------------------FN_DYNVARS_001_08-------------------------#'
 SET @@timestamp = OFF;
 ERROR 42000: Incorrect argument type to variable 'timestamp'
diff --git a/mysql-test/r/timestamp_func.result b/mysql-test/suite/sys_vars/r/timestamp_func.result
index 1b49331c069..1b49331c069 100644
--- a/mysql-test/r/timestamp_func.result
+++ b/mysql-test/suite/sys_vars/r/timestamp_func.result
diff --git a/mysql-test/r/timestamp_sysdate_is_now_func.result b/mysql-test/suite/sys_vars/r/timestamp_sysdate_is_now_func.result
index e24ff2e962a..e24ff2e962a 100644
--- a/mysql-test/r/timestamp_sysdate_is_now_func.result
+++ b/mysql-test/suite/sys_vars/r/timestamp_sysdate_is_now_func.result
diff --git a/mysql-test/r/tmpdir_basic.result b/mysql-test/suite/sys_vars/r/tmpdir_basic.result
index 613cc8ec3cd..613cc8ec3cd 100644
--- a/mysql-test/r/tmpdir_basic.result
+++ b/mysql-test/suite/sys_vars/r/tmpdir_basic.result
diff --git a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
index 706d7802ed3..4aaf67c4064 100644
--- a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
@@ -40,6 +40,8 @@ SELECT @@global.transaction_alloc_block_size;
 @@global.transaction_alloc_block_size
 59392
 SET @@global.transaction_alloc_block_size = 4294967295;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
 SELECT @@global.transaction_alloc_block_size;
 @@global.transaction_alloc_block_size
 4294966272
@@ -50,6 +52,8 @@ SELECT @@session.transaction_alloc_block_size;
 @@session.transaction_alloc_block_size
 1024
 SET @@session.transaction_alloc_block_size =4294967295;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
 SELECT @@session.transaction_alloc_block_size;
 @@session.transaction_alloc_block_size
 4294966272
@@ -146,6 +150,8 @@ WHERE VARIABLE_NAME='transaction_alloc_block_size';
 '#---------------------FN_DYNVARS_001_08----------------------#'
 SET @@transaction_alloc_block_size = 1024;
 SET @@global.transaction_alloc_block_size = 4294967295;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
 SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size;
 @@transaction_alloc_block_size = @@global.transaction_alloc_block_size
 0
diff --git a/mysql-test/r/tx_isolation_basic.result b/mysql-test/suite/sys_vars/r/tx_isolation_basic.result
index d487a6d92a8..d487a6d92a8 100644
--- a/mysql-test/r/tx_isolation_basic.result
+++ b/mysql-test/suite/sys_vars/r/tx_isolation_basic.result
diff --git a/mysql-test/r/tx_isolation_func.result b/mysql-test/suite/sys_vars/r/tx_isolation_func.result
index 2242525f14b..2242525f14b 100644
--- a/mysql-test/r/tx_isolation_func.result
+++ b/mysql-test/suite/sys_vars/r/tx_isolation_func.result
diff --git a/mysql-test/r/unique_checks_basic.result b/mysql-test/suite/sys_vars/r/unique_checks_basic.result
index cc22c1c7f98..cc22c1c7f98 100644
--- a/mysql-test/r/unique_checks_basic.result
+++ b/mysql-test/suite/sys_vars/r/unique_checks_basic.result
diff --git a/mysql-test/r/updatable_views_with_limit_basic.result b/mysql-test/suite/sys_vars/r/updatable_views_with_limit_basic.result
index e2eebbd7a2c..e2eebbd7a2c 100644
--- a/mysql-test/r/updatable_views_with_limit_basic.result
+++ b/mysql-test/suite/sys_vars/r/updatable_views_with_limit_basic.result
diff --git a/mysql-test/r/updatable_views_with_limit_func.result b/mysql-test/suite/sys_vars/r/updatable_views_with_limit_func.result
index 0fdd4cbbb1b..0fdd4cbbb1b 100644
--- a/mysql-test/r/updatable_views_with_limit_func.result
+++ b/mysql-test/suite/sys_vars/r/updatable_views_with_limit_func.result
diff --git a/mysql-test/r/version_basic.result b/mysql-test/suite/sys_vars/r/version_basic.result
index 01710426ac9..01710426ac9 100644
--- a/mysql-test/r/version_basic.result
+++ b/mysql-test/suite/sys_vars/r/version_basic.result
diff --git a/mysql-test/r/version_comment_basic.result b/mysql-test/suite/sys_vars/r/version_comment_basic.result
index 5ef4bdbdd87..5ef4bdbdd87 100644
--- a/mysql-test/r/version_comment_basic.result
+++ b/mysql-test/suite/sys_vars/r/version_comment_basic.result
diff --git a/mysql-test/r/version_compile_machine_basic.result b/mysql-test/suite/sys_vars/r/version_compile_machine_basic.result
index eb239041929..eb239041929 100644
--- a/mysql-test/r/version_compile_machine_basic.result
+++ b/mysql-test/suite/sys_vars/r/version_compile_machine_basic.result
diff --git a/mysql-test/r/version_compile_os_basic.result b/mysql-test/suite/sys_vars/r/version_compile_os_basic.result
index 64dcb761ae1..64dcb761ae1 100644
--- a/mysql-test/r/version_compile_os_basic.result
+++ b/mysql-test/suite/sys_vars/r/version_compile_os_basic.result
diff --git a/mysql-test/r/wait_timeout_func.result b/mysql-test/suite/sys_vars/r/wait_timeout_func.result
index 01b4a71df87..01b4a71df87 100644
--- a/mysql-test/r/wait_timeout_func.result
+++ b/mysql-test/suite/sys_vars/r/wait_timeout_func.result
diff --git a/mysql-test/r/warning_count_basic.result b/mysql-test/suite/sys_vars/r/warning_count_basic.result
index 0ce85c7bbf9..0ce85c7bbf9 100644
--- a/mysql-test/r/warning_count_basic.result
+++ b/mysql-test/suite/sys_vars/r/warning_count_basic.result
diff --git a/mysql-test/t/auto_commit_basic.test b/mysql-test/suite/sys_vars/t/auto_commit_basic.test
index 0ea070ded59..0ea070ded59 100644
--- a/mysql-test/t/auto_commit_basic.test
+++ b/mysql-test/suite/sys_vars/t/auto_commit_basic.test
diff --git a/mysql-test/t/auto_increment_increment_basic.test b/mysql-test/suite/sys_vars/t/auto_increment_increment_basic.test
index 4acfb8f503b..4acfb8f503b 100644
--- a/mysql-test/t/auto_increment_increment_basic.test
+++ b/mysql-test/suite/sys_vars/t/auto_increment_increment_basic.test
diff --git a/mysql-test/t/auto_increment_increment_func.test b/mysql-test/suite/sys_vars/t/auto_increment_increment_func.test
index 7822775fb35..7822775fb35 100644
--- a/mysql-test/t/auto_increment_increment_func.test
+++ b/mysql-test/suite/sys_vars/t/auto_increment_increment_func.test
diff --git a/mysql-test/t/auto_increment_offset_basic.test b/mysql-test/suite/sys_vars/t/auto_increment_offset_basic.test
index a98fd6467ad..a98fd6467ad 100644
--- a/mysql-test/t/auto_increment_offset_basic.test
+++ b/mysql-test/suite/sys_vars/t/auto_increment_offset_basic.test
diff --git a/mysql-test/t/auto_increment_offset_func.test b/mysql-test/suite/sys_vars/t/auto_increment_offset_func.test
index 7e1668452cc..7e1668452cc 100644
--- a/mysql-test/t/auto_increment_offset_func.test
+++ b/mysql-test/suite/sys_vars/t/auto_increment_offset_func.test
diff --git a/mysql-test/t/autocommit_func-master.opt b/mysql-test/suite/sys_vars/t/autocommit_func-master.opt
index 627becdbfb5..627becdbfb5 100644
--- a/mysql-test/t/autocommit_func-master.opt
+++ b/mysql-test/suite/sys_vars/t/autocommit_func-master.opt
diff --git a/mysql-test/t/autocommit_func.test b/mysql-test/suite/sys_vars/t/autocommit_func.test
index 07e15ce40da..07e15ce40da 100644
--- a/mysql-test/t/autocommit_func.test
+++ b/mysql-test/suite/sys_vars/t/autocommit_func.test
diff --git a/mysql-test/t/automatic_sp_privileges_basic.test b/mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test
index 74da0904454..74da0904454 100644
--- a/mysql-test/t/automatic_sp_privileges_basic.test
+++ b/mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test
diff --git a/mysql-test/t/automatic_sp_privileges_func.test b/mysql-test/suite/sys_vars/t/automatic_sp_privileges_func.test
index ae5edbb078e..ae5edbb078e 100644
--- a/mysql-test/t/automatic_sp_privileges_func.test
+++ b/mysql-test/suite/sys_vars/t/automatic_sp_privileges_func.test
diff --git a/mysql-test/t/basedir_basic.test b/mysql-test/suite/sys_vars/t/basedir_basic.test
index 480e46ca8a0..480e46ca8a0 100644
--- a/mysql-test/t/basedir_basic.test
+++ b/mysql-test/suite/sys_vars/t/basedir_basic.test
diff --git a/mysql-test/t/big_tables_basic.test b/mysql-test/suite/sys_vars/t/big_tables_basic.test
index 8665895bb19..8665895bb19 100644
--- a/mysql-test/t/big_tables_basic.test
+++ b/mysql-test/suite/sys_vars/t/big_tables_basic.test
diff --git a/mysql-test/t/binlog_format_basic.test b/mysql-test/suite/sys_vars/t/binlog_format_basic.test
index cd2b772fcb1..cd2b772fcb1 100644
--- a/mysql-test/t/binlog_format_basic.test
+++ b/mysql-test/suite/sys_vars/t/binlog_format_basic.test
diff --git a/mysql-test/t/character_set_client_basic.test b/mysql-test/suite/sys_vars/t/character_set_client_basic.test
index 69e4c07dcd8..177a663c112 100644
--- a/mysql-test/t/character_set_client_basic.test
+++ b/mysql-test/suite/sys_vars/t/character_set_client_basic.test
@@ -207,7 +207,7 @@ SELECT @@character_set_client;
 
 let charset_variable = @@global.character_set_client;
 
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 
 --echo '#--------------------FN_DYNVARS_010_08-------------------------#'
 ################################################################################
diff --git a/mysql-test/t/character_set_client_func.test b/mysql-test/suite/sys_vars/t/character_set_client_func.test
index 19994672fa4..19994672fa4 100644
--- a/mysql-test/t/character_set_client_func.test
+++ b/mysql-test/suite/sys_vars/t/character_set_client_func.test
diff --git a/mysql-test/t/character_set_connection_basic.test b/mysql-test/suite/sys_vars/t/character_set_connection_basic.test
index 509f8d0d346..5e28d43ce3e 100644
--- a/mysql-test/t/character_set_connection_basic.test
+++ b/mysql-test/suite/sys_vars/t/character_set_connection_basic.test
@@ -122,7 +122,7 @@ SET @@character_set_connection = utf8 + latin2;
 ##############################################################################
 
 let charset_variable = @@session.character_set_connection;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 
 
 --echo '#--------------------FN_DYNVARS_011_07-------------------------#'
@@ -131,7 +131,7 @@ let charset_variable = @@session.character_set_connection;
 ##############################################################################
 
 let charset_variable = @@global.character_set_connection;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 
 
 --echo '#--------------------FN_DYNVARS_011_08-------------------------#'
diff --git a/mysql-test/t/character_set_connection_func.test b/mysql-test/suite/sys_vars/t/character_set_connection_func.test
index 11a8e311fd1..11a8e311fd1 100644
--- a/mysql-test/t/character_set_connection_func.test
+++ b/mysql-test/suite/sys_vars/t/character_set_connection_func.test
diff --git a/mysql-test/t/character_set_database_basic.test b/mysql-test/suite/sys_vars/t/character_set_database_basic.test
index 9690fb84b5a..08069c00ae0 100644
--- a/mysql-test/t/character_set_database_basic.test
+++ b/mysql-test/suite/sys_vars/t/character_set_database_basic.test
@@ -121,7 +121,7 @@ SET @@character_set_database = utf8 + latin2;
 #############################################################################
 
 let charset_variable = @@session.character_set_database;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 
 
 --echo '#--------------------FN_DYNVARS_012_07-------------------------#'
@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_database;
 ##############################################################################
 
 let charset_variable = @@global.character_set_database;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 
 
 --echo '#--------------------FN_DYNVARS_012_08-------------------------#'
diff --git a/mysql-test/t/character_set_database_func.test b/mysql-test/suite/sys_vars/t/character_set_database_func.test
index 88c77ef8c51..88c77ef8c51 100644
--- a/mysql-test/t/character_set_database_func.test
+++ b/mysql-test/suite/sys_vars/t/character_set_database_func.test
diff --git a/mysql-test/t/character_set_filesystem_basic.test b/mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test
index 0117145a06b..3ba9c269a84 100644
--- a/mysql-test/t/character_set_filesystem_basic.test
+++ b/mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test
@@ -121,7 +121,7 @@ SET @@character_set_filesystem = utf8 + latin2;
 ###############################################################################
 
 let charset_variable = @@session.character_set_filesystem;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 
 
 --echo '#--------------------FN_DYNVARS_008_07-------------------------#'
@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_filesystem;
 ##############################################################################
 
 let charset_variable = @@global.character_set_filesystem;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 
 
 --echo '#--------------------FN_DYNVARS_008_08-------------------------#'
diff --git a/mysql-test/t/character_set_filesystem_func-master.opt b/mysql-test/suite/sys_vars/t/character_set_filesystem_func-master.opt
index 52a49182a53..52a49182a53 100644
--- a/mysql-test/t/character_set_filesystem_func-master.opt
+++ b/mysql-test/suite/sys_vars/t/character_set_filesystem_func-master.opt
diff --git a/mysql-test/t/character_set_results_basic.test b/mysql-test/suite/sys_vars/t/character_set_results_basic.test
index aae05c824d1..98635c00287 100644
--- a/mysql-test/t/character_set_results_basic.test
+++ b/mysql-test/suite/sys_vars/t/character_set_results_basic.test
@@ -121,7 +121,7 @@ SET @@character_set_results = utf8 + latin2;
 ##############################################################################
 
 let charset_variable = @@session.character_set_results;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 
 
 --echo '#--------------------FN_DYNVARS_013_07-------------------------#'
@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_results;
 ###############################################################################
 
 let charset_variable = @@global.character_set_results;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 
 
 --echo '#--------------------FN_DYNVARS_013_08-------------------------#'
diff --git a/mysql-test/t/character_set_results_func.test b/mysql-test/suite/sys_vars/t/character_set_results_func.test
index df7437f225f..df7437f225f 100644
--- a/mysql-test/t/character_set_results_func.test
+++ b/mysql-test/suite/sys_vars/t/character_set_results_func.test
diff --git a/mysql-test/t/character_set_server_basic.test b/mysql-test/suite/sys_vars/t/character_set_server_basic.test
index 2b3c078363a..21eb3fb36dc 100644
--- a/mysql-test/t/character_set_server_basic.test
+++ b/mysql-test/suite/sys_vars/t/character_set_server_basic.test
@@ -123,7 +123,7 @@ SET @@character_set_server = utf8 + latin2;
 
 let charset_variable = @@session.character_set_server;
 
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 
 
 --echo '#--------------------FN_DYNVARS_009_07-------------------------#'
@@ -132,7 +132,7 @@ let charset_variable = @@session.character_set_server;
 ###############################################################################
 
 let charset_variable = @@global.character_set_server;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 
 
 --echo '#--------------------FN_DYNVARS_009_08-------------------------#'
diff --git a/mysql-test/t/character_set_server_func.test b/mysql-test/suite/sys_vars/t/character_set_server_func.test
index c17568c35ea..c17568c35ea 100644
--- a/mysql-test/t/character_set_server_func.test
+++ b/mysql-test/suite/sys_vars/t/character_set_server_func.test
diff --git a/mysql-test/t/character_set_system_basic.test b/mysql-test/suite/sys_vars/t/character_set_system_basic.test
index 9d59b313efc..9d59b313efc 100644
--- a/mysql-test/t/character_set_system_basic.test
+++ b/mysql-test/suite/sys_vars/t/character_set_system_basic.test
diff --git a/mysql-test/t/collation_connection_basic.test b/mysql-test/suite/sys_vars/t/collation_connection_basic.test
index f3544dd306e..bf82ea321b7 100644
--- a/mysql-test/t/collation_connection_basic.test
+++ b/mysql-test/suite/sys_vars/t/collation_connection_basic.test
@@ -122,7 +122,7 @@ SET @@collation_connection = latin7_general_ci + latin7_general_cs;
 ###############################################################################
 
 let collation_variable = @@session.collation_connection;
---source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
 
 
 --echo '#--------------------FN_DYNVARS_015_07-------------------------#'
@@ -131,7 +131,7 @@ let collation_variable = @@session.collation_connection;
 ###############################################################################
 
 let collation_variable = @@global.collation_connection;
---source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
 
 
 --echo '#--------------------FN_DYNVARS_015_08-------------------------#'
diff --git a/mysql-test/t/collation_connection_func.test b/mysql-test/suite/sys_vars/t/collation_connection_func.test
index bdb2efd9959..bdb2efd9959 100644
--- a/mysql-test/t/collation_connection_func.test
+++ b/mysql-test/suite/sys_vars/t/collation_connection_func.test
diff --git a/mysql-test/t/collation_database_basic.test b/mysql-test/suite/sys_vars/t/collation_database_basic.test
index c130e276084..557f32b86a0 100644
--- a/mysql-test/t/collation_database_basic.test
+++ b/mysql-test/suite/sys_vars/t/collation_database_basic.test
@@ -121,7 +121,7 @@ SET @@collation_database = latin7_general_ci + latin7_general_cs;
 ###########################################################################
 
 let collation_variable = @@session.collation_database;
---source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
 
 
 --echo '#--------------------FN_DYNVARS_016_07-------------------------#'
@@ -130,7 +130,7 @@ let collation_variable = @@session.collation_database;
 ###############################################################################
 
 let collation_variable = @@global.collation_database;
---source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
 
 
 --echo '#--------------------FN_DYNVARS_016_08-------------------------#'
diff --git a/mysql-test/t/collation_database_func.test b/mysql-test/suite/sys_vars/t/collation_database_func.test
index ba8fc5a3d5e..ba8fc5a3d5e 100644
--- a/mysql-test/t/collation_database_func.test
+++ b/mysql-test/suite/sys_vars/t/collation_database_func.test
diff --git a/mysql-test/t/collation_server_basic.test b/mysql-test/suite/sys_vars/t/collation_server_basic.test
index c4b469007e5..a8af13c13ae 100644
--- a/mysql-test/t/collation_server_basic.test
+++ b/mysql-test/suite/sys_vars/t/collation_server_basic.test
@@ -121,7 +121,7 @@ SET @@collation_server = latin7_general_ci + latin7_general_cs;
 ##############################################################################
 
 let collation_variable = @@session.collation_server;
---source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
 
 
 --echo '#--------------------FN_DYNVARS_014_07-------------------------#'
@@ -130,7 +130,7 @@ let collation_variable = @@session.collation_server;
 #############################################################################
 
 let collation_variable = @@global.collation_server;
---source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
 
 
 --echo '#--------------------FN_DYNVARS_014_08-------------------------#'
diff --git a/mysql-test/t/collation_server_func.test b/mysql-test/suite/sys_vars/t/collation_server_func.test
index 045cb5cf720..045cb5cf720 100644
--- a/mysql-test/t/collation_server_func.test
+++ b/mysql-test/suite/sys_vars/t/collation_server_func.test
diff --git a/mysql-test/t/completion_type_basic.test b/mysql-test/suite/sys_vars/t/completion_type_basic.test
index 7ffc1aa593b..7ffc1aa593b 100644
--- a/mysql-test/t/completion_type_basic.test
+++ b/mysql-test/suite/sys_vars/t/completion_type_basic.test
diff --git a/mysql-test/t/completion_type_func-master.opt b/mysql-test/suite/sys_vars/t/completion_type_func-master.opt
index 627becdbfb5..627becdbfb5 100644
--- a/mysql-test/t/completion_type_func-master.opt
+++ b/mysql-test/suite/sys_vars/t/completion_type_func-master.opt
diff --git a/mysql-test/t/completion_type_func.test b/mysql-test/suite/sys_vars/t/completion_type_func.test
index ed0f04c37b4..ed0f04c37b4 100644
--- a/mysql-test/t/completion_type_func.test
+++ b/mysql-test/suite/sys_vars/t/completion_type_func.test
diff --git a/mysql-test/t/concurrent_insert_basic.test b/mysql-test/suite/sys_vars/t/concurrent_insert_basic.test
index bc401ef22a3..bc401ef22a3 100644
--- a/mysql-test/t/concurrent_insert_basic.test
+++ b/mysql-test/suite/sys_vars/t/concurrent_insert_basic.test
diff --git a/mysql-test/t/concurrent_insert_func.test b/mysql-test/suite/sys_vars/t/concurrent_insert_func.test
index cdeb76d9cac..cdeb76d9cac 100644
--- a/mysql-test/t/concurrent_insert_func.test
+++ b/mysql-test/suite/sys_vars/t/concurrent_insert_func.test
diff --git a/mysql-test/t/connect_timeout_basic.test b/mysql-test/suite/sys_vars/t/connect_timeout_basic.test
index 095c85f8295..095c85f8295 100644
--- a/mysql-test/t/connect_timeout_basic.test
+++ b/mysql-test/suite/sys_vars/t/connect_timeout_basic.test
diff --git a/mysql-test/t/datadir_basic.test b/mysql-test/suite/sys_vars/t/datadir_basic.test
index 7fae68fa55e..7fae68fa55e 100644
--- a/mysql-test/t/datadir_basic.test
+++ b/mysql-test/suite/sys_vars/t/datadir_basic.test
diff --git a/mysql-test/t/default_week_format_basic.test b/mysql-test/suite/sys_vars/t/default_week_format_basic.test
index d8b4a09541f..d8b4a09541f 100644
--- a/mysql-test/t/default_week_format_basic.test
+++ b/mysql-test/suite/sys_vars/t/default_week_format_basic.test
diff --git a/mysql-test/t/default_week_format_func.test b/mysql-test/suite/sys_vars/t/default_week_format_func.test
index c80c49b39fb..c80c49b39fb 100644
--- a/mysql-test/t/default_week_format_func.test
+++ b/mysql-test/suite/sys_vars/t/default_week_format_func.test
diff --git a/mysql-test/t/delay_key_write_basic.test b/mysql-test/suite/sys_vars/t/delay_key_write_basic.test
index faa1cb3cc6e..faa1cb3cc6e 100644
--- a/mysql-test/t/delay_key_write_basic.test
+++ b/mysql-test/suite/sys_vars/t/delay_key_write_basic.test
diff --git a/mysql-test/t/delay_key_write_func-master.opt b/mysql-test/suite/sys_vars/t/delay_key_write_func-master.opt
index a449c0fb964..a449c0fb964 100644
--- a/mysql-test/t/delay_key_write_func-master.opt
+++ b/mysql-test/suite/sys_vars/t/delay_key_write_func-master.opt
diff --git a/mysql-test/t/delay_key_write_func.test b/mysql-test/suite/sys_vars/t/delay_key_write_func.test
index a44b37653d2..a44b37653d2 100644
--- a/mysql-test/t/delay_key_write_func.test
+++ b/mysql-test/suite/sys_vars/t/delay_key_write_func.test
diff --git a/mysql-test/t/delayed_insert_limit_func.test b/mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test
index 97e1f2daed1..97e1f2daed1 100644
--- a/mysql-test/t/delayed_insert_limit_func.test
+++ b/mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test
diff --git a/mysql-test/t/delayed_insert_timeout_basic.test b/mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test
index 8bad6b2dfe6..8bad6b2dfe6 100644
--- a/mysql-test/t/delayed_insert_timeout_basic.test
+++ b/mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test
diff --git a/mysql-test/t/div_precision_increment_basic.test b/mysql-test/suite/sys_vars/t/div_precision_increment_basic.test
index 40497e829df..40497e829df 100644
--- a/mysql-test/t/div_precision_increment_basic.test
+++ b/mysql-test/suite/sys_vars/t/div_precision_increment_basic.test
diff --git a/mysql-test/t/div_precision_increment_func.test b/mysql-test/suite/sys_vars/t/div_precision_increment_func.test
index aebca88abf9..aebca88abf9 100644
--- a/mysql-test/t/div_precision_increment_func.test
+++ b/mysql-test/suite/sys_vars/t/div_precision_increment_func.test
diff --git a/mysql-test/t/engine_condition_pushdown_basic.test b/mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test
index ee781159d6a..ee781159d6a 100644
--- a/mysql-test/t/engine_condition_pushdown_basic.test
+++ b/mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test
diff --git a/mysql-test/t/error_count_basic.test b/mysql-test/suite/sys_vars/t/error_count_basic.test
index 14001874c22..14001874c22 100644
--- a/mysql-test/t/error_count_basic.test
+++ b/mysql-test/suite/sys_vars/t/error_count_basic.test
diff --git a/mysql-test/t/event_scheduler_basic.test b/mysql-test/suite/sys_vars/t/event_scheduler_basic.test
index f7045651613..f7045651613 100644
--- a/mysql-test/t/event_scheduler_basic.test
+++ b/mysql-test/suite/sys_vars/t/event_scheduler_basic.test
diff --git a/mysql-test/t/event_scheduler_func.test b/mysql-test/suite/sys_vars/t/event_scheduler_func.test
index f727b2b6833..f727b2b6833 100644
--- a/mysql-test/t/event_scheduler_func.test
+++ b/mysql-test/suite/sys_vars/t/event_scheduler_func.test
diff --git a/mysql-test/t/expire_logs_days_basic.test b/mysql-test/suite/sys_vars/t/expire_logs_days_basic.test
index 02448d1fd11..02448d1fd11 100644
--- a/mysql-test/t/expire_logs_days_basic.test
+++ b/mysql-test/suite/sys_vars/t/expire_logs_days_basic.test
diff --git a/mysql-test/t/flush_basic.test b/mysql-test/suite/sys_vars/t/flush_basic.test
index f5f6665562e..f5f6665562e 100644
--- a/mysql-test/t/flush_basic.test
+++ b/mysql-test/suite/sys_vars/t/flush_basic.test
diff --git a/mysql-test/t/foreign_key_checks_basic.test b/mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test
index 54d94aca971..54d94aca971 100644
--- a/mysql-test/t/foreign_key_checks_basic.test
+++ b/mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test
diff --git a/mysql-test/t/foreign_key_checks_func.test b/mysql-test/suite/sys_vars/t/foreign_key_checks_func.test
index 4d2c63bbce6..4d2c63bbce6 100644
--- a/mysql-test/t/foreign_key_checks_func.test
+++ b/mysql-test/suite/sys_vars/t/foreign_key_checks_func.test
diff --git a/mysql-test/t/ft_boolean_syntax_basic.test b/mysql-test/suite/sys_vars/t/ft_boolean_syntax_basic.test
index 4117605c452..4117605c452 100644
--- a/mysql-test/t/ft_boolean_syntax_basic.test
+++ b/mysql-test/suite/sys_vars/t/ft_boolean_syntax_basic.test
diff --git a/mysql-test/t/ft_boolean_syntax_func.test b/mysql-test/suite/sys_vars/t/ft_boolean_syntax_func.test
index 4ea28b015cb..4ea28b015cb 100644
--- a/mysql-test/t/ft_boolean_syntax_func.test
+++ b/mysql-test/suite/sys_vars/t/ft_boolean_syntax_func.test
diff --git a/mysql-test/t/general_log_basic.test b/mysql-test/suite/sys_vars/t/general_log_basic.test
index 82f3be45bc9..82f3be45bc9 100644
--- a/mysql-test/t/general_log_basic.test
+++ b/mysql-test/suite/sys_vars/t/general_log_basic.test
diff --git a/mysql-test/t/general_log_file_basic-master.opt b/mysql-test/suite/sys_vars/t/general_log_file_basic-master.opt
index 8482f8cbbc3..8482f8cbbc3 100644
--- a/mysql-test/t/general_log_file_basic-master.opt
+++ b/mysql-test/suite/sys_vars/t/general_log_file_basic-master.opt
diff --git a/mysql-test/t/general_log_file_basic.test b/mysql-test/suite/sys_vars/t/general_log_file_basic.test
index 014108f88d2..014108f88d2 100644
--- a/mysql-test/t/general_log_file_basic.test
+++ b/mysql-test/suite/sys_vars/t/general_log_file_basic.test
diff --git a/mysql-test/t/general_log_file_func-master.opt b/mysql-test/suite/sys_vars/t/general_log_file_func-master.opt
index 3652d715f5f..3652d715f5f 100644
--- a/mysql-test/t/general_log_file_func-master.opt
+++ b/mysql-test/suite/sys_vars/t/general_log_file_func-master.opt
diff --git a/mysql-test/t/general_log_file_func.test b/mysql-test/suite/sys_vars/t/general_log_file_func.test
index 1a73a4a5eaa..1a73a4a5eaa 100644
--- a/mysql-test/t/general_log_file_func.test
+++ b/mysql-test/suite/sys_vars/t/general_log_file_func.test
diff --git a/mysql-test/t/general_log_func.test b/mysql-test/suite/sys_vars/t/general_log_func.test
index 24d535e88e5..24d535e88e5 100644
--- a/mysql-test/t/general_log_func.test
+++ b/mysql-test/suite/sys_vars/t/general_log_func.test
diff --git a/mysql-test/t/group_concat_max_len_basic.test b/mysql-test/suite/sys_vars/t/group_concat_max_len_basic.test
index 1bc707f4b5d..1bc707f4b5d 100644
--- a/mysql-test/t/group_concat_max_len_basic.test
+++ b/mysql-test/suite/sys_vars/t/group_concat_max_len_basic.test
diff --git a/mysql-test/t/group_concat_max_len_func.test b/mysql-test/suite/sys_vars/t/group_concat_max_len_func.test
index 29a4ff5becb..29a4ff5becb 100644
--- a/mysql-test/t/group_concat_max_len_func.test
+++ b/mysql-test/suite/sys_vars/t/group_concat_max_len_func.test
diff --git a/mysql-test/t/have_compress_basic.test b/mysql-test/suite/sys_vars/t/have_compress_basic.test
index f704ae67a1c..f704ae67a1c 100644
--- a/mysql-test/t/have_compress_basic.test
+++ b/mysql-test/suite/sys_vars/t/have_compress_basic.test
diff --git a/mysql-test/t/have_crypt_basic.test b/mysql-test/suite/sys_vars/t/have_crypt_basic.test
index 7ca193d83bd..7ca193d83bd 100644
--- a/mysql-test/t/have_crypt_basic.test
+++ b/mysql-test/suite/sys_vars/t/have_crypt_basic.test
diff --git a/mysql-test/t/have_csv_basic.test b/mysql-test/suite/sys_vars/t/have_csv_basic.test
index 12081ff270e..12081ff270e 100644
--- a/mysql-test/t/have_csv_basic.test
+++ b/mysql-test/suite/sys_vars/t/have_csv_basic.test
diff --git a/mysql-test/t/have_dynamic_loading_basic.test b/mysql-test/suite/sys_vars/t/have_dynamic_loading_basic.test
index 3e13664752a..3e13664752a 100644
--- a/mysql-test/t/have_dynamic_loading_basic.test
+++ b/mysql-test/suite/sys_vars/t/have_dynamic_loading_basic.test
diff --git a/mysql-test/t/have_geometry_basic.test b/mysql-test/suite/sys_vars/t/have_geometry_basic.test
index 3ec0690bd16..3ec0690bd16 100644
--- a/mysql-test/t/have_geometry_basic.test
+++ b/mysql-test/suite/sys_vars/t/have_geometry_basic.test
diff --git a/mysql-test/t/have_innodb_basic.test b/mysql-test/suite/sys_vars/t/have_innodb_basic.test
index 9ae1bb0d443..9ae1bb0d443 100644
--- a/mysql-test/t/have_innodb_basic.test
+++ b/mysql-test/suite/sys_vars/t/have_innodb_basic.test
diff --git a/mysql-test/t/have_ndbcluster_basic.test b/mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test
index 1ac341ff62e..1ac341ff62e 100644
--- a/mysql-test/t/have_ndbcluster_basic.test
+++ b/mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test
diff --git a/mysql-test/t/have_openssl_basic.test b/mysql-test/suite/sys_vars/t/have_openssl_basic.test
index 037c8f4cbe6..037c8f4cbe6 100644
--- a/mysql-test/t/have_openssl_basic.test
+++ b/mysql-test/suite/sys_vars/t/have_openssl_basic.test
diff --git a/mysql-test/t/have_partitioning_basic.test b/mysql-test/suite/sys_vars/t/have_partitioning_basic.test
index b37abdb1498..b37abdb1498 100644
--- a/mysql-test/t/have_partitioning_basic.test
+++ b/mysql-test/suite/sys_vars/t/have_partitioning_basic.test
diff --git a/mysql-test/t/have_query_cache_basic.test b/mysql-test/suite/sys_vars/t/have_query_cache_basic.test
index 1c32300dec9..1c32300dec9 100644
--- a/mysql-test/t/have_query_cache_basic.test
+++ b/mysql-test/suite/sys_vars/t/have_query_cache_basic.test
diff --git a/mysql-test/t/have_rtree_keys_basic.test b/mysql-test/suite/sys_vars/t/have_rtree_keys_basic.test
index 493c45530a6..493c45530a6 100644
--- a/mysql-test/t/have_rtree_keys_basic.test
+++ b/mysql-test/suite/sys_vars/t/have_rtree_keys_basic.test
diff --git a/mysql-test/t/have_ssl_basic.test b/mysql-test/suite/sys_vars/t/have_ssl_basic.test
index c92219d2252..c92219d2252 100644
--- a/mysql-test/t/have_ssl_basic.test
+++ b/mysql-test/suite/sys_vars/t/have_ssl_basic.test
diff --git a/mysql-test/t/have_symlink_basic.test b/mysql-test/suite/sys_vars/t/have_symlink_basic.test
index 924da7c7a9f..924da7c7a9f 100644
--- a/mysql-test/t/have_symlink_basic.test
+++ b/mysql-test/suite/sys_vars/t/have_symlink_basic.test
diff --git a/mysql-test/t/hostname_basic.test b/mysql-test/suite/sys_vars/t/hostname_basic.test
index 9f1dff756e2..9f1dff756e2 100644
--- a/mysql-test/t/hostname_basic.test
+++ b/mysql-test/suite/sys_vars/t/hostname_basic.test
diff --git a/mysql-test/t/identity_basic.test b/mysql-test/suite/sys_vars/t/identity_basic.test
index fa5fc807414..fa5fc807414 100644
--- a/mysql-test/t/identity_basic.test
+++ b/mysql-test/suite/sys_vars/t/identity_basic.test
diff --git a/mysql-test/t/identity_func-master.opt b/mysql-test/suite/sys_vars/t/identity_func-master.opt
index 66f581b56d0..66f581b56d0 100644
--- a/mysql-test/t/identity_func-master.opt
+++ b/mysql-test/suite/sys_vars/t/identity_func-master.opt
diff --git a/mysql-test/t/identity_func.test b/mysql-test/suite/sys_vars/t/identity_func.test
index ff93607a2cd..ff93607a2cd 100644
--- a/mysql-test/t/identity_func.test
+++ b/mysql-test/suite/sys_vars/t/identity_func.test
diff --git a/mysql-test/t/init_connect_basic.test b/mysql-test/suite/sys_vars/t/init_connect_basic.test
index 8557dfbf4fc..8557dfbf4fc 100644
--- a/mysql-test/t/init_connect_basic.test
+++ b/mysql-test/suite/sys_vars/t/init_connect_basic.test
diff --git a/mysql-test/t/init_slave_basic.test b/mysql-test/suite/sys_vars/t/init_slave_basic.test
index b137a525090..b137a525090 100644
--- a/mysql-test/t/init_slave_basic.test
+++ b/mysql-test/suite/sys_vars/t/init_slave_basic.test
diff --git a/mysql-test/t/innodb_additional_mem_pool_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_additional_mem_pool_size_basic.test
index ffb1046ed32..ffb1046ed32 100644
--- a/mysql-test/t/innodb_additional_mem_pool_size_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_additional_mem_pool_size_basic.test
diff --git a/mysql-test/t/innodb_autoextend_increment_basic.test b/mysql-test/suite/sys_vars/t/innodb_autoextend_increment_basic.test
index eb208e7197f..eb208e7197f 100644
--- a/mysql-test/t/innodb_autoextend_increment_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_autoextend_increment_basic.test
diff --git a/mysql-test/t/innodb_autoinc_lock_mode_basic.test b/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test
index 5b6fa943bbe..5b6fa943bbe 100644
--- a/mysql-test/t/innodb_autoinc_lock_mode_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test
diff --git a/mysql-test/t/innodb_autoinc_lock_mode_func-master.opt b/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func-master.opt
index ab9fcb75678..ab9fcb75678 100644
--- a/mysql-test/t/innodb_autoinc_lock_mode_func-master.opt
+++ b/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func-master.opt
diff --git a/mysql-test/t/innodb_autoinc_lock_mode_func.test b/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test
index 89c1c80a6dc..89c1c80a6dc 100644
--- a/mysql-test/t/innodb_autoinc_lock_mode_func.test
+++ b/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test
diff --git a/mysql-test/t/innodb_buffer_pool_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test
index 190b2d19bc4..190b2d19bc4 100644
--- a/mysql-test/t/innodb_buffer_pool_size_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test
diff --git a/mysql-test/t/innodb_checksums_basic.test b/mysql-test/suite/sys_vars/t/innodb_checksums_basic.test
index 89daad9ce0a..89daad9ce0a 100644
--- a/mysql-test/t/innodb_checksums_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_checksums_basic.test
diff --git a/mysql-test/t/innodb_commit_concurrency_basic.test b/mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test
index 1ef69e34999..1ef69e34999 100644
--- a/mysql-test/t/innodb_commit_concurrency_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test
diff --git a/mysql-test/t/innodb_data_file_path_basic.test b/mysql-test/suite/sys_vars/t/innodb_data_file_path_basic.test
index 1d88c47b1bb..1d88c47b1bb 100644
--- a/mysql-test/t/innodb_data_file_path_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_data_file_path_basic.test
diff --git a/mysql-test/t/innodb_data_home_dir_basic.test b/mysql-test/suite/sys_vars/t/innodb_data_home_dir_basic.test
index f3b02edf83b..f3b02edf83b 100644
--- a/mysql-test/t/innodb_data_home_dir_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_data_home_dir_basic.test
diff --git a/mysql-test/t/innodb_doublewrite_basic.test b/mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test
index 4a0460bb4bc..4a0460bb4bc 100644
--- a/mysql-test/t/innodb_doublewrite_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test
diff --git a/mysql-test/t/innodb_fast_shutdown_basic.test b/mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test
index 7de63332844..7de63332844 100644
--- a/mysql-test/t/innodb_fast_shutdown_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test
diff --git a/mysql-test/t/innodb_file_io_threads_basic.test b/mysql-test/suite/sys_vars/t/innodb_file_io_threads_basic.test
index 8e09c75ded6..8e09c75ded6 100644
--- a/mysql-test/t/innodb_file_io_threads_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_file_io_threads_basic.test
diff --git a/mysql-test/t/innodb_file_per_table_basic.test b/mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test
index bc0e34c484e..bc0e34c484e 100644
--- a/mysql-test/t/innodb_file_per_table_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test
diff --git a/mysql-test/t/innodb_flush_log_at_trx_commit_basic.test b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test
index 90da929d199..90da929d199 100644
--- a/mysql-test/t/innodb_flush_log_at_trx_commit_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test
diff --git a/mysql-test/t/innodb_flush_method_basic.test b/mysql-test/suite/sys_vars/t/innodb_flush_method_basic.test
index 531df4a2464..531df4a2464 100644
--- a/mysql-test/t/innodb_flush_method_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_flush_method_basic.test
diff --git a/mysql-test/t/innodb_force_recovery_basic.test b/mysql-test/suite/sys_vars/t/innodb_force_recovery_basic.test
index f5aa769f09f..f5aa769f09f 100644
--- a/mysql-test/t/innodb_force_recovery_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_force_recovery_basic.test
diff --git a/mysql-test/t/innodb_lock_wait_timeout_basic.test b/mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test
index ed31fc9eb6b..ed31fc9eb6b 100644
--- a/mysql-test/t/innodb_lock_wait_timeout_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test
diff --git a/mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test b/mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test
index 63835113770..63835113770 100644
--- a/mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test
diff --git a/mysql-test/t/innodb_log_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_buffer_size_basic.test
index 74c1aeab87a..74c1aeab87a 100644
--- a/mysql-test/t/innodb_log_buffer_size_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_log_buffer_size_basic.test
diff --git a/mysql-test/t/innodb_log_file_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_file_size_basic.test
index 08925b73957..08925b73957 100644
--- a/mysql-test/t/innodb_log_file_size_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_log_file_size_basic.test
diff --git a/mysql-test/t/innodb_log_files_in_group_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_files_in_group_basic.test
index 67978efe76a..67978efe76a 100644
--- a/mysql-test/t/innodb_log_files_in_group_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_log_files_in_group_basic.test
diff --git a/mysql-test/t/innodb_log_group_home_dir_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_group_home_dir_basic.test
index 7e3969c6bd7..7e3969c6bd7 100644
--- a/mysql-test/t/innodb_log_group_home_dir_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_log_group_home_dir_basic.test
diff --git a/mysql-test/t/innodb_max_dirty_pages_pct_basic.test b/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test
index 830617866ca..830617866ca 100644
--- a/mysql-test/t/innodb_max_dirty_pages_pct_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test
diff --git a/mysql-test/t/innodb_max_dirty_pages_pct_func.test b/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_func.test
index 52ebc2f4c49..52ebc2f4c49 100644
--- a/mysql-test/t/innodb_max_dirty_pages_pct_func.test
+++ b/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_func.test
diff --git a/mysql-test/t/innodb_mirrored_log_groups_basic.test b/mysql-test/suite/sys_vars/t/innodb_mirrored_log_groups_basic.test
index 6edb07ac39f..6edb07ac39f 100644
--- a/mysql-test/t/innodb_mirrored_log_groups_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_mirrored_log_groups_basic.test
diff --git a/mysql-test/t/innodb_open_files_basic.test b/mysql-test/suite/sys_vars/t/innodb_open_files_basic.test
index c55b7e55937..c55b7e55937 100644
--- a/mysql-test/t/innodb_open_files_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_open_files_basic.test
diff --git a/mysql-test/t/innodb_rollback_on_timeout_basic.test b/mysql-test/suite/sys_vars/t/innodb_rollback_on_timeout_basic.test
index c33e0fa1b75..c33e0fa1b75 100644
--- a/mysql-test/t/innodb_rollback_on_timeout_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_rollback_on_timeout_basic.test
diff --git a/mysql-test/t/innodb_support_xa_basic.test b/mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test
index 6da3e68ebdf..6da3e68ebdf 100644
--- a/mysql-test/t/innodb_support_xa_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test
diff --git a/mysql-test/t/innodb_support_xa_func.test b/mysql-test/suite/sys_vars/t/innodb_support_xa_func.test
index f1b6fe84fe1..f1b6fe84fe1 100644
--- a/mysql-test/t/innodb_support_xa_func.test
+++ b/mysql-test/suite/sys_vars/t/innodb_support_xa_func.test
diff --git a/mysql-test/t/innodb_table_locks_basic.test b/mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test
index 35961c43a7f..35961c43a7f 100644
--- a/mysql-test/t/innodb_table_locks_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test
diff --git a/mysql-test/t/innodb_table_locks_func.test b/mysql-test/suite/sys_vars/t/innodb_table_locks_func.test
index 6638a20c926..6638a20c926 100644
--- a/mysql-test/t/innodb_table_locks_func.test
+++ b/mysql-test/suite/sys_vars/t/innodb_table_locks_func.test
diff --git a/mysql-test/t/innodb_thread_concurrency_basic.test b/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_basic.test
index 40ce09ce4db..40ce09ce4db 100644
--- a/mysql-test/t/innodb_thread_concurrency_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_basic.test
diff --git a/mysql-test/t/insert_id_basic.test b/mysql-test/suite/sys_vars/t/insert_id_basic.test
index cfae87095bc..cfae87095bc 100644
--- a/mysql-test/t/insert_id_basic.test
+++ b/mysql-test/suite/sys_vars/t/insert_id_basic.test
diff --git a/mysql-test/t/insert_id_func.test b/mysql-test/suite/sys_vars/t/insert_id_func.test
index d7103f806bd..d7103f806bd 100644
--- a/mysql-test/t/insert_id_func.test
+++ b/mysql-test/suite/sys_vars/t/insert_id_func.test
diff --git a/mysql-test/t/interactive_timeout_basic.test b/mysql-test/suite/sys_vars/t/interactive_timeout_basic.test
index 0c1a6716348..0c1a6716348 100644
--- a/mysql-test/t/interactive_timeout_basic.test
+++ b/mysql-test/suite/sys_vars/t/interactive_timeout_basic.test
diff --git a/mysql-test/t/interactive_timeout_func.test b/mysql-test/suite/sys_vars/t/interactive_timeout_func.test
index e3a210bf508..e3a210bf508 100644
--- a/mysql-test/t/interactive_timeout_func.test
+++ b/mysql-test/suite/sys_vars/t/interactive_timeout_func.test
diff --git a/mysql-test/t/keep_files_on_create_basic.test b/mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test
index a855f56c863..a855f56c863 100644
--- a/mysql-test/t/keep_files_on_create_basic.test
+++ b/mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test
diff --git a/mysql-test/t/key_buffer_size_func.test b/mysql-test/suite/sys_vars/t/key_buffer_size_func.test
index 8ee305a3ac1..8ee305a3ac1 100644
--- a/mysql-test/t/key_buffer_size_func.test
+++ b/mysql-test/suite/sys_vars/t/key_buffer_size_func.test
diff --git a/mysql-test/t/last_insert_id_func-master.opt b/mysql-test/suite/sys_vars/t/last_insert_id_func-master.opt
index 66f581b56d0..66f581b56d0 100644
--- a/mysql-test/t/last_insert_id_func-master.opt
+++ b/mysql-test/suite/sys_vars/t/last_insert_id_func-master.opt
diff --git a/mysql-test/t/last_insert_id_func.test b/mysql-test/suite/sys_vars/t/last_insert_id_func.test
index 2309c539bd9..2309c539bd9 100644
--- a/mysql-test/t/last_insert_id_func.test
+++ b/mysql-test/suite/sys_vars/t/last_insert_id_func.test
diff --git a/mysql-test/t/lc_time_names_basic.test b/mysql-test/suite/sys_vars/t/lc_time_names_basic.test
index d0aa0c56937..d0aa0c56937 100644
--- a/mysql-test/t/lc_time_names_basic.test
+++ b/mysql-test/suite/sys_vars/t/lc_time_names_basic.test
diff --git a/mysql-test/t/lc_time_names_func.test b/mysql-test/suite/sys_vars/t/lc_time_names_func.test
index 2c86a597773..2c86a597773 100644
--- a/mysql-test/t/lc_time_names_func.test
+++ b/mysql-test/suite/sys_vars/t/lc_time_names_func.test
diff --git a/mysql-test/t/license_basic.test b/mysql-test/suite/sys_vars/t/license_basic.test
index e0c761dc5a5..e0c761dc5a5 100644
--- a/mysql-test/t/license_basic.test
+++ b/mysql-test/suite/sys_vars/t/license_basic.test
diff --git a/mysql-test/t/local_infile_basic.test b/mysql-test/suite/sys_vars/t/local_infile_basic.test
index 63f6b0fdb91..63f6b0fdb91 100644
--- a/mysql-test/t/local_infile_basic.test
+++ b/mysql-test/suite/sys_vars/t/local_infile_basic.test
diff --git a/mysql-test/t/local_infile_func.test b/mysql-test/suite/sys_vars/t/local_infile_func.test
index 00013f779a7..00013f779a7 100644
--- a/mysql-test/t/local_infile_func.test
+++ b/mysql-test/suite/sys_vars/t/local_infile_func.test
diff --git a/mysql-test/t/log_basic.test b/mysql-test/suite/sys_vars/t/log_basic.test
index 98e99fa4e4f..98e99fa4e4f 100644
--- a/mysql-test/t/log_basic.test
+++ b/mysql-test/suite/sys_vars/t/log_basic.test
diff --git a/mysql-test/t/log_bin_trust_function_creators_basic.test b/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test
index 3b8b43e1354..3b8b43e1354 100644
--- a/mysql-test/t/log_bin_trust_function_creators_basic.test
+++ b/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test
diff --git a/mysql-test/t/log_bin_trust_function_creators_func.test b/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func.test
index 0168114b11b..0168114b11b 100644
--- a/mysql-test/t/log_bin_trust_function_creators_func.test
+++ b/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func.test
diff --git a/mysql-test/t/log_bin_trust_routine_creators_basic.test b/mysql-test/suite/sys_vars/t/log_bin_trust_routine_creators_basic.test
index 1d44c77b1a7..1d44c77b1a7 100644
--- a/mysql-test/t/log_bin_trust_routine_creators_basic.test
+++ b/mysql-test/suite/sys_vars/t/log_bin_trust_routine_creators_basic.test
diff --git a/mysql-test/t/log_output_basic.test b/mysql-test/suite/sys_vars/t/log_output_basic.test
index 45998e85480..45998e85480 100644
--- a/mysql-test/t/log_output_basic.test
+++ b/mysql-test/suite/sys_vars/t/log_output_basic.test
diff --git a/mysql-test/t/log_output_func.test b/mysql-test/suite/sys_vars/t/log_output_func.test
index 007c4f38659..007c4f38659 100644
--- a/mysql-test/t/log_output_func.test
+++ b/mysql-test/suite/sys_vars/t/log_output_func.test
diff --git a/mysql-test/t/log_queries_not_using_indexes_basic.test b/mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test
index f1152c07176..f1152c07176 100644
--- a/mysql-test/t/log_queries_not_using_indexes_basic.test
+++ b/mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test
diff --git a/mysql-test/t/long_query_time_basic.test b/mysql-test/suite/sys_vars/t/long_query_time_basic.test
index c21e0a751c1..c21e0a751c1 100644
--- a/mysql-test/t/long_query_time_basic.test
+++ b/mysql-test/suite/sys_vars/t/long_query_time_basic.test
diff --git a/mysql-test/t/low_priority_updates_basic.test b/mysql-test/suite/sys_vars/t/low_priority_updates_basic.test
index 0ce4ee8f921..0ce4ee8f921 100644
--- a/mysql-test/t/low_priority_updates_basic.test
+++ b/mysql-test/suite/sys_vars/t/low_priority_updates_basic.test
diff --git a/mysql-test/t/max_allowed_packet_basic.test b/mysql-test/suite/sys_vars/t/max_allowed_packet_basic.test
index 8be0e5f670e..8be0e5f670e 100644
--- a/mysql-test/t/max_allowed_packet_basic.test
+++ b/mysql-test/suite/sys_vars/t/max_allowed_packet_basic.test
diff --git a/mysql-test/t/max_allowed_packet_func.test b/mysql-test/suite/sys_vars/t/max_allowed_packet_func.test
index 0cfbeb4de5f..0cfbeb4de5f 100644
--- a/mysql-test/t/max_allowed_packet_func.test
+++ b/mysql-test/suite/sys_vars/t/max_allowed_packet_func.test
diff --git a/mysql-test/t/max_binlog_cache_size_func-master.opt b/mysql-test/suite/sys_vars/t/max_binlog_cache_size_func-master.opt
index 6e00d7157d6..6e00d7157d6 100644
--- a/mysql-test/t/max_binlog_cache_size_func-master.opt
+++ b/mysql-test/suite/sys_vars/t/max_binlog_cache_size_func-master.opt
diff --git a/mysql-test/t/max_binlog_size_basic.test b/mysql-test/suite/sys_vars/t/max_binlog_size_basic.test
index 11d01b5c10f..11d01b5c10f 100644
--- a/mysql-test/t/max_binlog_size_basic.test
+++ b/mysql-test/suite/sys_vars/t/max_binlog_size_basic.test
diff --git a/mysql-test/t/max_connections_basic.test b/mysql-test/suite/sys_vars/t/max_connections_basic.test
index ffc964db28f..ffc964db28f 100644
--- a/mysql-test/t/max_connections_basic.test
+++ b/mysql-test/suite/sys_vars/t/max_connections_basic.test
diff --git a/mysql-test/t/max_delayed_threads_basic.test b/mysql-test/suite/sys_vars/t/max_delayed_threads_basic.test
index dc908c8396b..dc908c8396b 100644
--- a/mysql-test/t/max_delayed_threads_basic.test
+++ b/mysql-test/suite/sys_vars/t/max_delayed_threads_basic.test
diff --git a/mysql-test/t/max_error_count_basic.test b/mysql-test/suite/sys_vars/t/max_error_count_basic.test
index 2b1e12843cf..2b1e12843cf 100644
--- a/mysql-test/t/max_error_count_basic.test
+++ b/mysql-test/suite/sys_vars/t/max_error_count_basic.test
diff --git a/mysql-test/t/max_insert_delayed_threads_basic.test b/mysql-test/suite/sys_vars/t/max_insert_delayed_threads_basic.test
index d165ddc11fe..d165ddc11fe 100644
--- a/mysql-test/t/max_insert_delayed_threads_basic.test
+++ b/mysql-test/suite/sys_vars/t/max_insert_delayed_threads_basic.test
diff --git a/mysql-test/t/max_join_size_func.test b/mysql-test/suite/sys_vars/t/max_join_size_func.test
index 0ea0d77bcd6..0ea0d77bcd6 100644
--- a/mysql-test/t/max_join_size_func.test
+++ b/mysql-test/suite/sys_vars/t/max_join_size_func.test
diff --git a/mysql-test/t/max_length_for_sort_data_basic.test b/mysql-test/suite/sys_vars/t/max_length_for_sort_data_basic.test
index 682e14146d7..682e14146d7 100644
--- a/mysql-test/t/max_length_for_sort_data_basic.test
+++ b/mysql-test/suite/sys_vars/t/max_length_for_sort_data_basic.test
diff --git a/mysql-test/t/max_prepared_stmt_count_basic.test b/mysql-test/suite/sys_vars/t/max_prepared_stmt_count_basic.test
index 2206a388abb..2206a388abb 100644
--- a/mysql-test/t/max_prepared_stmt_count_basic.test
+++ b/mysql-test/suite/sys_vars/t/max_prepared_stmt_count_basic.test
diff --git a/mysql-test/t/max_prepared_stmt_count_func.test b/mysql-test/suite/sys_vars/t/max_prepared_stmt_count_func.test
index 6617c4ad2ea..6617c4ad2ea 100644
--- a/mysql-test/t/max_prepared_stmt_count_func.test
+++ b/mysql-test/suite/sys_vars/t/max_prepared_stmt_count_func.test
diff --git a/mysql-test/t/max_relay_log_size_basic.test b/mysql-test/suite/sys_vars/t/max_relay_log_size_basic.test
index b780aa2b444..b780aa2b444 100644
--- a/mysql-test/t/max_relay_log_size_basic.test
+++ b/mysql-test/suite/sys_vars/t/max_relay_log_size_basic.test
diff --git a/mysql-test/t/max_seeks_for_key_func.test b/mysql-test/suite/sys_vars/t/max_seeks_for_key_func.test
index d49382b9f4f..d49382b9f4f 100644
--- a/mysql-test/t/max_seeks_for_key_func.test
+++ b/mysql-test/suite/sys_vars/t/max_seeks_for_key_func.test
diff --git a/mysql-test/t/max_sort_length_basic.test b/mysql-test/suite/sys_vars/t/max_sort_length_basic.test
index 1198d7b1851..1198d7b1851 100644
--- a/mysql-test/t/max_sort_length_basic.test
+++ b/mysql-test/suite/sys_vars/t/max_sort_length_basic.test
diff --git a/mysql-test/t/max_sort_length_func.test b/mysql-test/suite/sys_vars/t/max_sort_length_func.test
index 74642a10861..74642a10861 100644
--- a/mysql-test/t/max_sort_length_func.test
+++ b/mysql-test/suite/sys_vars/t/max_sort_length_func.test
diff --git a/mysql-test/t/max_sp_recursion_depth_basic.test b/mysql-test/suite/sys_vars/t/max_sp_recursion_depth_basic.test
index 8089951c8a2..8089951c8a2 100644
--- a/mysql-test/t/max_sp_recursion_depth_basic.test
+++ b/mysql-test/suite/sys_vars/t/max_sp_recursion_depth_basic.test
diff --git a/mysql-test/t/max_sp_recursion_depth_func.test b/mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func.test
index ab43536457b..ab43536457b 100644
--- a/mysql-test/t/max_sp_recursion_depth_func.test
+++ b/mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func.test
diff --git a/mysql-test/t/max_user_connections_basic.test b/mysql-test/suite/sys_vars/t/max_user_connections_basic.test
index eb231bd8076..eb231bd8076 100644
--- a/mysql-test/t/max_user_connections_basic.test
+++ b/mysql-test/suite/sys_vars/t/max_user_connections_basic.test
diff --git a/mysql-test/t/max_user_connections_func.test b/mysql-test/suite/sys_vars/t/max_user_connections_func.test
index 841a630c5ce..841a630c5ce 100644
--- a/mysql-test/t/max_user_connections_func.test
+++ b/mysql-test/suite/sys_vars/t/max_user_connections_func.test
diff --git a/mysql-test/t/myisam_data_pointer_size_basic.test b/mysql-test/suite/sys_vars/t/myisam_data_pointer_size_basic.test
index d151c6000b8..d151c6000b8 100644
--- a/mysql-test/t/myisam_data_pointer_size_basic.test
+++ b/mysql-test/suite/sys_vars/t/myisam_data_pointer_size_basic.test
diff --git a/mysql-test/t/myisam_data_pointer_size_func.test b/mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func.test
index 37dd3a5a297..37dd3a5a297 100644
--- a/mysql-test/t/myisam_data_pointer_size_func.test
+++ b/mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func.test
diff --git a/mysql-test/t/myisam_stats_method_basic.test b/mysql-test/suite/sys_vars/t/myisam_stats_method_basic.test
index 0045842269b..0045842269b 100644
--- a/mysql-test/t/myisam_stats_method_basic.test
+++ b/mysql-test/suite/sys_vars/t/myisam_stats_method_basic.test
diff --git a/mysql-test/t/myisam_stats_method_func.test b/mysql-test/suite/sys_vars/t/myisam_stats_method_func.test
index a317f8d93da..a317f8d93da 100644
--- a/mysql-test/t/myisam_stats_method_func.test
+++ b/mysql-test/suite/sys_vars/t/myisam_stats_method_func.test
diff --git a/mysql-test/t/myisam_use_mmap_basic.test b/mysql-test/suite/sys_vars/t/myisam_use_mmap_basic.test
index d2cc39cfea7..d2cc39cfea7 100644
--- a/mysql-test/t/myisam_use_mmap_basic.test
+++ b/mysql-test/suite/sys_vars/t/myisam_use_mmap_basic.test
diff --git a/mysql-test/t/ndb_log_update_as_write_basic.test b/mysql-test/suite/sys_vars/t/ndb_log_update_as_write_basic.test
index 0b9d3ada158..0b9d3ada158 100644
--- a/mysql-test/t/ndb_log_update_as_write_basic.test
+++ b/mysql-test/suite/sys_vars/t/ndb_log_update_as_write_basic.test
diff --git a/mysql-test/t/ndb_log_updated_only_basic.test b/mysql-test/suite/sys_vars/t/ndb_log_updated_only_basic.test
index 85b76cc88a4..85b76cc88a4 100644
--- a/mysql-test/t/ndb_log_updated_only_basic.test
+++ b/mysql-test/suite/sys_vars/t/ndb_log_updated_only_basic.test
diff --git a/mysql-test/t/net_buffer_length_basic.test b/mysql-test/suite/sys_vars/t/net_buffer_length_basic.test
index 6e1e0559c61..6e1e0559c61 100644
--- a/mysql-test/t/net_buffer_length_basic.test
+++ b/mysql-test/suite/sys_vars/t/net_buffer_length_basic.test
diff --git a/mysql-test/t/net_read_timeout_basic.test b/mysql-test/suite/sys_vars/t/net_read_timeout_basic.test
index f0d32302e4f..f0d32302e4f 100644
--- a/mysql-test/t/net_read_timeout_basic.test
+++ b/mysql-test/suite/sys_vars/t/net_read_timeout_basic.test
diff --git a/mysql-test/t/net_write_timeout_basic.test b/mysql-test/suite/sys_vars/t/net_write_timeout_basic.test
index 84c682561e3..84c682561e3 100644
--- a/mysql-test/t/net_write_timeout_basic.test
+++ b/mysql-test/suite/sys_vars/t/net_write_timeout_basic.test
diff --git a/mysql-test/t/new_basic.test b/mysql-test/suite/sys_vars/t/new_basic.test
index b1d12c9a4de..b1d12c9a4de 100644
--- a/mysql-test/t/new_basic.test
+++ b/mysql-test/suite/sys_vars/t/new_basic.test
diff --git a/mysql-test/t/old_passwords_basic.test b/mysql-test/suite/sys_vars/t/old_passwords_basic.test
index b78ac9ca9b8..b78ac9ca9b8 100644
--- a/mysql-test/t/old_passwords_basic.test
+++ b/mysql-test/suite/sys_vars/t/old_passwords_basic.test
diff --git a/mysql-test/t/old_passwords_func.test b/mysql-test/suite/sys_vars/t/old_passwords_func.test
index 2707fc3ab6d..2707fc3ab6d 100644
--- a/mysql-test/t/old_passwords_func.test
+++ b/mysql-test/suite/sys_vars/t/old_passwords_func.test
diff --git a/mysql-test/t/optimizer_prune_level_basic.test b/mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test
index 58c074d7d5e..58c074d7d5e 100644
--- a/mysql-test/t/optimizer_prune_level_basic.test
+++ b/mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test
diff --git a/mysql-test/t/optimizer_search_depth_basic.test b/mysql-test/suite/sys_vars/t/optimizer_search_depth_basic.test
index 42548c59d40..42548c59d40 100644
--- a/mysql-test/t/optimizer_search_depth_basic.test
+++ b/mysql-test/suite/sys_vars/t/optimizer_search_depth_basic.test
diff --git a/mysql-test/t/preload_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/preload_buffer_size_basic.test
index 48b1e32676a..48b1e32676a 100644
--- a/mysql-test/t/preload_buffer_size_basic.test
+++ b/mysql-test/suite/sys_vars/t/preload_buffer_size_basic.test
diff --git a/mysql-test/t/query_cache_limit_func.test b/mysql-test/suite/sys_vars/t/query_cache_limit_func.test
index e90a0e6adda..e90a0e6adda 100644
--- a/mysql-test/t/query_cache_limit_func.test
+++ b/mysql-test/suite/sys_vars/t/query_cache_limit_func.test
diff --git a/mysql-test/t/query_cache_type_basic.test b/mysql-test/suite/sys_vars/t/query_cache_type_basic.test
index ba7e26a3065..ba7e26a3065 100644
--- a/mysql-test/t/query_cache_type_basic.test
+++ b/mysql-test/suite/sys_vars/t/query_cache_type_basic.test
diff --git a/mysql-test/t/query_cache_type_func.test b/mysql-test/suite/sys_vars/t/query_cache_type_func.test
index 4679d1ec339..4679d1ec339 100644
--- a/mysql-test/t/query_cache_type_func.test
+++ b/mysql-test/suite/sys_vars/t/query_cache_type_func.test
diff --git a/mysql-test/t/query_cache_wlock_invalidate_basic.test b/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test
index f253c1b4f43..f253c1b4f43 100644
--- a/mysql-test/t/query_cache_wlock_invalidate_basic.test
+++ b/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test
diff --git a/mysql-test/t/query_cache_wlock_invalidate_func.test b/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test
index 83b0c446b28..83b0c446b28 100644
--- a/mysql-test/t/query_cache_wlock_invalidate_func.test
+++ b/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test
diff --git a/mysql-test/t/query_prealloc_size_func.test b/mysql-test/suite/sys_vars/t/query_prealloc_size_func.test
index 7267b9e317e..7267b9e317e 100644
--- a/mysql-test/t/query_prealloc_size_func.test
+++ b/mysql-test/suite/sys_vars/t/query_prealloc_size_func.test
diff --git a/mysql-test/t/read_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/read_buffer_size_basic.test
index 405bb9da6d8..405bb9da6d8 100644
--- a/mysql-test/t/read_buffer_size_basic.test
+++ b/mysql-test/suite/sys_vars/t/read_buffer_size_basic.test
diff --git a/mysql-test/t/read_only_basic.test b/mysql-test/suite/sys_vars/t/read_only_basic.test
index 917842256b1..917842256b1 100644
--- a/mysql-test/t/read_only_basic.test
+++ b/mysql-test/suite/sys_vars/t/read_only_basic.test
diff --git a/mysql-test/t/read_only_func.test b/mysql-test/suite/sys_vars/t/read_only_func.test
index c8fb932544b..c8fb932544b 100644
--- a/mysql-test/t/read_only_func.test
+++ b/mysql-test/suite/sys_vars/t/read_only_func.test
diff --git a/mysql-test/t/read_rnd_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/read_rnd_buffer_size_basic.test
index e3d2a4b89f7..e3d2a4b89f7 100644
--- a/mysql-test/t/read_rnd_buffer_size_basic.test
+++ b/mysql-test/suite/sys_vars/t/read_rnd_buffer_size_basic.test
diff --git a/mysql-test/t/relay_log_purge_basic.test b/mysql-test/suite/sys_vars/t/relay_log_purge_basic.test
index 7e4d6a51440..7e4d6a51440 100644
--- a/mysql-test/t/relay_log_purge_basic.test
+++ b/mysql-test/suite/sys_vars/t/relay_log_purge_basic.test
diff --git a/mysql-test/t/rpl_init_slave_func.test b/mysql-test/suite/sys_vars/t/rpl_init_slave_func.test
index f17cc1289b1..f17cc1289b1 100644
--- a/mysql-test/t/rpl_init_slave_func.test
+++ b/mysql-test/suite/sys_vars/t/rpl_init_slave_func.test
diff --git a/mysql-test/t/rpl_max_binlog_size_func-master.opt b/mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func-master.opt
index bff213dfb0b..bff213dfb0b 100644
--- a/mysql-test/t/rpl_max_binlog_size_func-master.opt
+++ b/mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func-master.opt
diff --git a/mysql-test/t/rpl_max_binlog_size_func.test b/mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test
index c00db582deb..c00db582deb 100644
--- a/mysql-test/t/rpl_max_binlog_size_func.test
+++ b/mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test
diff --git a/mysql-test/t/secure_auth_basic.test b/mysql-test/suite/sys_vars/t/secure_auth_basic.test
index b52f219097b..b52f219097b 100644
--- a/mysql-test/t/secure_auth_basic.test
+++ b/mysql-test/suite/sys_vars/t/secure_auth_basic.test
diff --git a/mysql-test/t/secure_auth_func-master.opt b/mysql-test/suite/sys_vars/t/secure_auth_func-master.opt
index 38ba956df15..38ba956df15 100644
--- a/mysql-test/t/secure_auth_func-master.opt
+++ b/mysql-test/suite/sys_vars/t/secure_auth_func-master.opt
diff --git a/mysql-test/t/secure_auth_func.test b/mysql-test/suite/sys_vars/t/secure_auth_func.test
index 10dc383035d..10dc383035d 100644
--- a/mysql-test/t/secure_auth_func.test
+++ b/mysql-test/suite/sys_vars/t/secure_auth_func.test
diff --git a/mysql-test/t/slave_allow_batching_basic.test b/mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test
index cf31917933a..cf31917933a 100644
--- a/mysql-test/t/slave_allow_batching_basic.test
+++ b/mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test
diff --git a/mysql-test/t/slave_compressed_protocol_basic.test b/mysql-test/suite/sys_vars/t/slave_compressed_protocol_basic.test
index 29a3227a8f5..29a3227a8f5 100644
--- a/mysql-test/t/slave_compressed_protocol_basic.test
+++ b/mysql-test/suite/sys_vars/t/slave_compressed_protocol_basic.test
diff --git a/mysql-test/t/slave_exec_mode_basic.test b/mysql-test/suite/sys_vars/t/slave_exec_mode_basic.test
index 5c5b4e7da1b..5c5b4e7da1b 100644
--- a/mysql-test/t/slave_exec_mode_basic.test
+++ b/mysql-test/suite/sys_vars/t/slave_exec_mode_basic.test
diff --git a/mysql-test/t/slave_net_timeout_basic.test b/mysql-test/suite/sys_vars/t/slave_net_timeout_basic.test
index 5662eec3957..5662eec3957 100644
--- a/mysql-test/t/slave_net_timeout_basic.test
+++ b/mysql-test/suite/sys_vars/t/slave_net_timeout_basic.test
diff --git a/mysql-test/t/slow_launch_time_basic.test b/mysql-test/suite/sys_vars/t/slow_launch_time_basic.test
index 6289a91abb3..6289a91abb3 100644
--- a/mysql-test/t/slow_launch_time_basic.test
+++ b/mysql-test/suite/sys_vars/t/slow_launch_time_basic.test
diff --git a/mysql-test/t/slow_launch_time_func.test b/mysql-test/suite/sys_vars/t/slow_launch_time_func.test
index c9a7d28bb8a..c9a7d28bb8a 100644
--- a/mysql-test/t/slow_launch_time_func.test
+++ b/mysql-test/suite/sys_vars/t/slow_launch_time_func.test
diff --git a/mysql-test/t/slow_query_log_basic.test b/mysql-test/suite/sys_vars/t/slow_query_log_basic.test
index 3a1b2fbd9e7..3a1b2fbd9e7 100644
--- a/mysql-test/t/slow_query_log_basic.test
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_basic.test
diff --git a/mysql-test/t/slow_query_log_file_basic-master.opt b/mysql-test/suite/sys_vars/t/slow_query_log_file_basic-master.opt
index aca191f7fea..aca191f7fea 100644
--- a/mysql-test/t/slow_query_log_file_basic-master.opt
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_file_basic-master.opt
diff --git a/mysql-test/t/slow_query_log_file_basic.test b/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test
index 9125b686cad..9125b686cad 100644
--- a/mysql-test/t/slow_query_log_file_basic.test
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test
diff --git a/mysql-test/t/slow_query_log_file_func-master.opt b/mysql-test/suite/sys_vars/t/slow_query_log_file_func-master.opt
index e5b1c0948b0..e5b1c0948b0 100644
--- a/mysql-test/t/slow_query_log_file_func-master.opt
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_file_func-master.opt
diff --git a/mysql-test/t/slow_query_log_file_func.test b/mysql-test/suite/sys_vars/t/slow_query_log_file_func.test
index 32420fc294a..32420fc294a 100644
--- a/mysql-test/t/slow_query_log_file_func.test
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_file_func.test
diff --git a/mysql-test/t/slow_query_log_func.test b/mysql-test/suite/sys_vars/t/slow_query_log_func.test
index 9bcbeb14fd7..9bcbeb14fd7 100644
--- a/mysql-test/t/slow_query_log_func.test
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_func.test
diff --git a/mysql-test/t/sql_auto_is_null_basic.test b/mysql-test/suite/sys_vars/t/sql_auto_is_null_basic.test
index a843b88bf85..a843b88bf85 100644
--- a/mysql-test/t/sql_auto_is_null_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_auto_is_null_basic.test
diff --git a/mysql-test/t/sql_big_selects_basic.test b/mysql-test/suite/sys_vars/t/sql_big_selects_basic.test
index dd83a19230a..dd83a19230a 100644
--- a/mysql-test/t/sql_big_selects_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_big_selects_basic.test
diff --git a/mysql-test/t/sql_big_selects_func.test b/mysql-test/suite/sys_vars/t/sql_big_selects_func.test
index 4aefda5e15e..4aefda5e15e 100644
--- a/mysql-test/t/sql_big_selects_func.test
+++ b/mysql-test/suite/sys_vars/t/sql_big_selects_func.test
diff --git a/mysql-test/t/sql_big_tables_basic.test b/mysql-test/suite/sys_vars/t/sql_big_tables_basic.test
index 4e3dbdc9504..4e3dbdc9504 100644
--- a/mysql-test/t/sql_big_tables_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_big_tables_basic.test
diff --git a/mysql-test/t/sql_big_tables_func.test b/mysql-test/suite/sys_vars/t/sql_big_tables_func.test
index 5f919fac2c7..5f919fac2c7 100644
--- a/mysql-test/t/sql_big_tables_func.test
+++ b/mysql-test/suite/sys_vars/t/sql_big_tables_func.test
diff --git a/mysql-test/t/sql_buffer_result_basic.test b/mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test
index f5a5e323fc4..f5a5e323fc4 100644
--- a/mysql-test/t/sql_buffer_result_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test
diff --git a/mysql-test/t/sql_buffer_result_func.test b/mysql-test/suite/sys_vars/t/sql_buffer_result_func.test
index 4530545b8f0..4530545b8f0 100644
--- a/mysql-test/t/sql_buffer_result_func.test
+++ b/mysql-test/suite/sys_vars/t/sql_buffer_result_func.test
diff --git a/mysql-test/t/sql_log_bin_basic.test b/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test
index 0f6d9e1e126..0f6d9e1e126 100644
--- a/mysql-test/t/sql_log_bin_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test
diff --git a/mysql-test/t/sql_log_off_basic.test b/mysql-test/suite/sys_vars/t/sql_log_off_basic.test
index bcf9e87c1dd..bcf9e87c1dd 100644
--- a/mysql-test/t/sql_log_off_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_log_off_basic.test
diff --git a/mysql-test/t/sql_log_off_func.test b/mysql-test/suite/sys_vars/t/sql_log_off_func.test
index fb06a12b264..fb06a12b264 100644
--- a/mysql-test/t/sql_log_off_func.test
+++ b/mysql-test/suite/sys_vars/t/sql_log_off_func.test
diff --git a/mysql-test/t/sql_low_priority_updates_basic.test b/mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test
index 499723b636d..499723b636d 100644
--- a/mysql-test/t/sql_low_priority_updates_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test
diff --git a/mysql-test/t/sql_low_priority_updates_func.test b/mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test
index 6ff684af6cd..6ff684af6cd 100644
--- a/mysql-test/t/sql_low_priority_updates_func.test
+++ b/mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test
diff --git a/mysql-test/t/sql_max_join_size_func.test b/mysql-test/suite/sys_vars/t/sql_max_join_size_func.test
index 17b7d911b94..17b7d911b94 100644
--- a/mysql-test/t/sql_max_join_size_func.test
+++ b/mysql-test/suite/sys_vars/t/sql_max_join_size_func.test
diff --git a/mysql-test/t/sql_mode_basic.test b/mysql-test/suite/sys_vars/t/sql_mode_basic.test
index 24f1e8aefcb..24f1e8aefcb 100644
--- a/mysql-test/t/sql_mode_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_mode_basic.test
diff --git a/mysql-test/t/sql_mode_func.test b/mysql-test/suite/sys_vars/t/sql_mode_func.test
index 5bb804c26da..5bb804c26da 100644
--- a/mysql-test/t/sql_mode_func.test
+++ b/mysql-test/suite/sys_vars/t/sql_mode_func.test
diff --git a/mysql-test/t/sql_notes_basic.test b/mysql-test/suite/sys_vars/t/sql_notes_basic.test
index 984dca34e46..984dca34e46 100644
--- a/mysql-test/t/sql_notes_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_notes_basic.test
diff --git a/mysql-test/t/sql_notes_func.test b/mysql-test/suite/sys_vars/t/sql_notes_func.test
index f7c521d3736..f7c521d3736 100644
--- a/mysql-test/t/sql_notes_func.test
+++ b/mysql-test/suite/sys_vars/t/sql_notes_func.test
diff --git a/mysql-test/t/sql_quote_show_create_basic.test b/mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test
index 1919b3ee642..1919b3ee642 100644
--- a/mysql-test/t/sql_quote_show_create_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test
diff --git a/mysql-test/t/sql_quote_show_create_func.test b/mysql-test/suite/sys_vars/t/sql_quote_show_create_func.test
index 6350771a0da..6350771a0da 100644
--- a/mysql-test/t/sql_quote_show_create_func.test
+++ b/mysql-test/suite/sys_vars/t/sql_quote_show_create_func.test
diff --git a/mysql-test/t/sql_safe_updates_basic.test b/mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test
index 489b42949a0..489b42949a0 100644
--- a/mysql-test/t/sql_safe_updates_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test
diff --git a/mysql-test/t/sql_safe_updates_func.test b/mysql-test/suite/sys_vars/t/sql_safe_updates_func.test
index a8ce3a8d0f7..a8ce3a8d0f7 100644
--- a/mysql-test/t/sql_safe_updates_func.test
+++ b/mysql-test/suite/sys_vars/t/sql_safe_updates_func.test
diff --git a/mysql-test/t/sql_select_limit_func.test b/mysql-test/suite/sys_vars/t/sql_select_limit_func.test
index ed582949aa0..ed582949aa0 100644
--- a/mysql-test/t/sql_select_limit_func.test
+++ b/mysql-test/suite/sys_vars/t/sql_select_limit_func.test
diff --git a/mysql-test/t/sql_slave_skip_counter_basic.test b/mysql-test/suite/sys_vars/t/sql_slave_skip_counter_basic.test
index e7d9098aee9..e7d9098aee9 100644
--- a/mysql-test/t/sql_slave_skip_counter_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_slave_skip_counter_basic.test
diff --git a/mysql-test/t/sql_warnings_basic.test b/mysql-test/suite/sys_vars/t/sql_warnings_basic.test
index f740403ceda..f740403ceda 100644
--- a/mysql-test/t/sql_warnings_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_warnings_basic.test
diff --git a/mysql-test/t/sql_warnings_func.test b/mysql-test/suite/sys_vars/t/sql_warnings_func.test
index e7705d1f146..e7705d1f146 100644
--- a/mysql-test/t/sql_warnings_func.test
+++ b/mysql-test/suite/sys_vars/t/sql_warnings_func.test
diff --git a/mysql-test/t/ssl_ca_basic.test b/mysql-test/suite/sys_vars/t/ssl_ca_basic.test
index c369f1f0894..c369f1f0894 100644
--- a/mysql-test/t/ssl_ca_basic.test
+++ b/mysql-test/suite/sys_vars/t/ssl_ca_basic.test
diff --git a/mysql-test/t/ssl_capath_basic.test b/mysql-test/suite/sys_vars/t/ssl_capath_basic.test
index c32b572fb1b..c32b572fb1b 100644
--- a/mysql-test/t/ssl_capath_basic.test
+++ b/mysql-test/suite/sys_vars/t/ssl_capath_basic.test
diff --git a/mysql-test/t/ssl_cert_basic.test b/mysql-test/suite/sys_vars/t/ssl_cert_basic.test
index c3b69bd495f..c3b69bd495f 100644
--- a/mysql-test/t/ssl_cert_basic.test
+++ b/mysql-test/suite/sys_vars/t/ssl_cert_basic.test
diff --git a/mysql-test/t/ssl_cipher_basic.test b/mysql-test/suite/sys_vars/t/ssl_cipher_basic.test
index 425f7aae442..425f7aae442 100644
--- a/mysql-test/t/ssl_cipher_basic.test
+++ b/mysql-test/suite/sys_vars/t/ssl_cipher_basic.test
diff --git a/mysql-test/t/ssl_key_basic.test b/mysql-test/suite/sys_vars/t/ssl_key_basic.test
index 4616f281c27..4616f281c27 100644
--- a/mysql-test/t/ssl_key_basic.test
+++ b/mysql-test/suite/sys_vars/t/ssl_key_basic.test
diff --git a/mysql-test/t/storage_engine_basic-master.opt b/mysql-test/suite/sys_vars/t/storage_engine_basic-master.opt
index 627becdbfb5..627becdbfb5 100644
--- a/mysql-test/t/storage_engine_basic-master.opt
+++ b/mysql-test/suite/sys_vars/t/storage_engine_basic-master.opt
diff --git a/mysql-test/t/storage_engine_basic.test b/mysql-test/suite/sys_vars/t/storage_engine_basic.test
index 689afcd1010..689afcd1010 100644
--- a/mysql-test/t/storage_engine_basic.test
+++ b/mysql-test/suite/sys_vars/t/storage_engine_basic.test
diff --git a/mysql-test/t/sync_frm_basic.test b/mysql-test/suite/sys_vars/t/sync_frm_basic.test
index 6c00182a805..6c00182a805 100644
--- a/mysql-test/t/sync_frm_basic.test
+++ b/mysql-test/suite/sys_vars/t/sync_frm_basic.test
diff --git a/mysql-test/t/system_time_zone_basic.test b/mysql-test/suite/sys_vars/t/system_time_zone_basic.test
index 0dfc850d227..0dfc850d227 100644
--- a/mysql-test/t/system_time_zone_basic.test
+++ b/mysql-test/suite/sys_vars/t/system_time_zone_basic.test
diff --git a/mysql-test/t/table_definition_cache_basic.test b/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test
index 63296590511..63296590511 100644
--- a/mysql-test/t/table_definition_cache_basic.test
+++ b/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test
diff --git a/mysql-test/t/table_lock_wait_timeout_basic.test b/mysql-test/suite/sys_vars/t/table_lock_wait_timeout_basic.test
index 43186c70874..43186c70874 100644
--- a/mysql-test/t/table_lock_wait_timeout_basic.test
+++ b/mysql-test/suite/sys_vars/t/table_lock_wait_timeout_basic.test
diff --git a/mysql-test/t/table_open_cache_basic.test b/mysql-test/suite/sys_vars/t/table_open_cache_basic.test
index 23f60bde00a..23f60bde00a 100644
--- a/mysql-test/t/table_open_cache_basic.test
+++ b/mysql-test/suite/sys_vars/t/table_open_cache_basic.test
diff --git a/mysql-test/t/thread_cache_size_func.test b/mysql-test/suite/sys_vars/t/thread_cache_size_func.test
index fe9f4242c0d..fe9f4242c0d 100644
--- a/mysql-test/t/thread_cache_size_func.test
+++ b/mysql-test/suite/sys_vars/t/thread_cache_size_func.test
diff --git a/mysql-test/t/thread_handling_basic.test b/mysql-test/suite/sys_vars/t/thread_handling_basic.test
index bcad003ce93..bcad003ce93 100644
--- a/mysql-test/t/thread_handling_basic.test
+++ b/mysql-test/suite/sys_vars/t/thread_handling_basic.test
diff --git a/mysql-test/t/time_zone_basic.test b/mysql-test/suite/sys_vars/t/time_zone_basic.test
index 32616e97534..32616e97534 100644
--- a/mysql-test/t/time_zone_basic.test
+++ b/mysql-test/suite/sys_vars/t/time_zone_basic.test
diff --git a/mysql-test/t/time_zone_func.test b/mysql-test/suite/sys_vars/t/time_zone_func.test
index 1d9bc954d8a..1d9bc954d8a 100644
--- a/mysql-test/t/time_zone_func.test
+++ b/mysql-test/suite/sys_vars/t/time_zone_func.test
diff --git a/mysql-test/t/timed_mutexes_basic.test b/mysql-test/suite/sys_vars/t/timed_mutexes_basic.test
index b0eb41afb49..b0eb41afb49 100644
--- a/mysql-test/t/timed_mutexes_basic.test
+++ b/mysql-test/suite/sys_vars/t/timed_mutexes_basic.test
diff --git a/mysql-test/t/timestamp_func.test b/mysql-test/suite/sys_vars/t/timestamp_func.test
index e119f1b6253..e119f1b6253 100644
--- a/mysql-test/t/timestamp_func.test
+++ b/mysql-test/suite/sys_vars/t/timestamp_func.test
diff --git a/mysql-test/t/timestamp_sysdate_is_now_func-master.opt b/mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func-master.opt
index 97a58d28032..97a58d28032 100644
--- a/mysql-test/t/timestamp_sysdate_is_now_func-master.opt
+++ b/mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func-master.opt
diff --git a/mysql-test/t/timestamp_sysdate_is_now_func.test b/mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func.test
index 7ca3b4cddac..7ca3b4cddac 100644
--- a/mysql-test/t/timestamp_sysdate_is_now_func.test
+++ b/mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func.test
diff --git a/mysql-test/t/tmpdir_basic.test b/mysql-test/suite/sys_vars/t/tmpdir_basic.test
index 5e9d08c4876..5e9d08c4876 100644
--- a/mysql-test/t/tmpdir_basic.test
+++ b/mysql-test/suite/sys_vars/t/tmpdir_basic.test
diff --git a/mysql-test/t/tx_isolation_basic.test b/mysql-test/suite/sys_vars/t/tx_isolation_basic.test
index 136a9b4331e..136a9b4331e 100644
--- a/mysql-test/t/tx_isolation_basic.test
+++ b/mysql-test/suite/sys_vars/t/tx_isolation_basic.test
diff --git a/mysql-test/t/tx_isolation_func-master.opt b/mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt
index c15943a7544..c15943a7544 100644
--- a/mysql-test/t/tx_isolation_func-master.opt
+++ b/mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt
diff --git a/mysql-test/t/tx_isolation_func.test b/mysql-test/suite/sys_vars/t/tx_isolation_func.test
index 1fd2e323db8..1fd2e323db8 100644
--- a/mysql-test/t/tx_isolation_func.test
+++ b/mysql-test/suite/sys_vars/t/tx_isolation_func.test
diff --git a/mysql-test/t/unique_checks_basic.test b/mysql-test/suite/sys_vars/t/unique_checks_basic.test
index 55308adcc82..55308adcc82 100644
--- a/mysql-test/t/unique_checks_basic.test
+++ b/mysql-test/suite/sys_vars/t/unique_checks_basic.test
diff --git a/mysql-test/t/updatable_views_with_limit_basic.test b/mysql-test/suite/sys_vars/t/updatable_views_with_limit_basic.test
index 61a45793d39..61a45793d39 100644
--- a/mysql-test/t/updatable_views_with_limit_basic.test
+++ b/mysql-test/suite/sys_vars/t/updatable_views_with_limit_basic.test
diff --git a/mysql-test/t/updatable_views_with_limit_func.test b/mysql-test/suite/sys_vars/t/updatable_views_with_limit_func.test
index 2e1a3f97346..2e1a3f97346 100644
--- a/mysql-test/t/updatable_views_with_limit_func.test
+++ b/mysql-test/suite/sys_vars/t/updatable_views_with_limit_func.test
diff --git a/mysql-test/t/version_basic.test b/mysql-test/suite/sys_vars/t/version_basic.test
index 0a22713ca12..0a22713ca12 100644
--- a/mysql-test/t/version_basic.test
+++ b/mysql-test/suite/sys_vars/t/version_basic.test
diff --git a/mysql-test/t/version_comment_basic.test b/mysql-test/suite/sys_vars/t/version_comment_basic.test
index 3ae6daa192a..3ae6daa192a 100644
--- a/mysql-test/t/version_comment_basic.test
+++ b/mysql-test/suite/sys_vars/t/version_comment_basic.test
diff --git a/mysql-test/t/version_compile_machine_basic.test b/mysql-test/suite/sys_vars/t/version_compile_machine_basic.test
index 30742436068..30742436068 100644
--- a/mysql-test/t/version_compile_machine_basic.test
+++ b/mysql-test/suite/sys_vars/t/version_compile_machine_basic.test
diff --git a/mysql-test/t/version_compile_os_basic.test b/mysql-test/suite/sys_vars/t/version_compile_os_basic.test
index 8858f248249..8858f248249 100644
--- a/mysql-test/t/version_compile_os_basic.test
+++ b/mysql-test/suite/sys_vars/t/version_compile_os_basic.test
diff --git a/mysql-test/t/wait_timeout_func.test b/mysql-test/suite/sys_vars/t/wait_timeout_func.test
index 6b7c8d016d2..6b7c8d016d2 100644
--- a/mysql-test/t/wait_timeout_func.test
+++ b/mysql-test/suite/sys_vars/t/wait_timeout_func.test
diff --git a/mysql-test/t/warning_count_basic.test b/mysql-test/suite/sys_vars/t/warning_count_basic.test
index 64539e28d5b..64539e28d5b 100644
--- a/mysql-test/t/warning_count_basic.test
+++ b/mysql-test/suite/sys_vars/t/warning_count_basic.test