merge with 5.3

sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup

106 files changed, 311 insertions, 2195 deletions

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 83edefaaf25..2a589ae3771 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
@@ -80,8 +80,6 @@ SELECT @@global.query_cache_size;
 
 SET @@global.query_cache_size = -1;
 SELECT @@global.query_cache_size;
-SET @@global.query_cache_size = 4294967296;
-SELECT @@global.query_cache_size;
 SET @@global.query_cache_size = 511;
 SELECT @@global.query_cache_size;
 --Error ER_WRONG_TYPE_FOR_VAR
@@ -89,8 +87,6 @@ SET @@global.query_cache_size = 10000.01;
 SELECT @@global.query_cache_size;
 SET @@global.query_cache_size = -1024;
 SELECT @@global.query_cache_size;
-SET @@global.query_cache_size = 42949672950;
-SELECT @@global.query_cache_size;
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.query_cache_size = ON;
 SELECT @@global.query_cache_size;
diff --git a/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc b/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc
index 56c93163621..5eabf457a0c 100644
--- a/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc
@@ -75,10 +75,6 @@ SELECT @@global.transaction_prealloc_size;
 SET @@global.transaction_prealloc_size = 60020;
 SELECT @@global.transaction_prealloc_size;
 
-SET @@global.transaction_prealloc_size = 4294966272;
-SELECT @@global.transaction_prealloc_size;
-
-
 --echo '#--------------------FN_DYNVARS_005_04-------------------------#'
 ###################################################################
 # Change the value of variable to a valid value for SESSION Scope #
@@ -87,12 +83,9 @@ SELECT @@global.transaction_prealloc_size;
 SET @@session.transaction_prealloc_size = 1024;
 SELECT @@session.transaction_prealloc_size;
 
-SET @@session.transaction_prealloc_size =4294966272;
-SELECT @@session.transaction_prealloc_size;
 SET @@session.transaction_prealloc_size = 65535;
 SELECT @@session.transaction_prealloc_size;
 
-
 --echo '#------------------FN_DYNVARS_005_05-----------------------#'
 #####################################################################
 # Change the value of transaction_prealloc_size to an invalid value #
@@ -144,10 +137,6 @@ SELECT @@session.transaction_prealloc_size;
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@session.transaction_prealloc_size = "Test";
 
-SET @@session.transaction_prealloc_size = 123456789031;
-SELECT @@session.transaction_prealloc_size;
-
-
 --echo '#------------------FN_DYNVARS_005_06-----------------------#'
 ####################################################################
 #   Check if the value in GLOBAL Table matches value in variable   #
@@ -167,9 +156,6 @@ SELECT @@session.transaction_prealloc_size = VARIABLE_VALUE
 FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
 WHERE VARIABLE_NAME='transaction_prealloc_size';
 
-
-
-
 --echo '#---------------------FN_DYNVARS_001_09----------------------#'
 ###########################################################################
 #  Check if global and session variable are independent of each other     #
@@ -180,7 +166,6 @@ SET @@global.transaction_prealloc_size = 10;
 
 SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
  
-
 --echo '#---------------------FN_DYNVARS_001_10----------------------#'
 ########################################################################
 #    Check if accessing variable with SESSION,LOCAL and without SCOPE  #
diff --git a/mysql-test/suite/sys_vars/r/all_vars.result b/mysql-test/suite/sys_vars/r/all_vars.result
index af05e3bc393..39065701100 100644
--- a/mysql-test/suite/sys_vars/r/all_vars.result
+++ b/mysql-test/suite/sys_vars/r/all_vars.result
@@ -5,11 +5,22 @@ insert into t2 select variable_name from information_schema.global_variables;
 insert into t2 select variable_name from information_schema.session_variables;
 delete from t2 where variable_name='innodb_change_buffering_debug';
 update t2 set variable_name= replace(variable_name, "PERFORMANCE_SCHEMA_", "PFS_");
-select variable_name as `There should be *no* long test name listed below:` from t2
+select distinct variable_name as `There should be *no* long test name listed below:` from t2
 where length(variable_name) > 50;
 There should be *no* long test name listed below:
-select variable_name as `There should be *no* variables listed below:` from t2
+select distinct variable_name as `There should be *no* variables listed below:` from t2
 left join t1 on variable_name=test_name where test_name is null;
 There should be *no* variables listed below:
+BINLOG_ANNOTATE_ROWS_EVENTS
+BINLOG_DBUG_FSYNC_SLEEP
+BINLOG_OPTIMIZE_THREAD_SCHEDULING
+IN_TRANSACTION
+JOIN_BUFFER_SPACE_LIMIT
+LOG_BASENAME
+MYISAM_BLOCK_SIZE
+PROGRESS_REPORT_TIME
+QUERY_CACHE_STRIP_COMMENTS
+REPLICATE_ANNOTATE_ROWS_EVENTS
+THREAD_ALARM
 drop table t1;
 drop table t2;
diff --git a/mysql-test/suite/sys_vars/r/aria_checkpoint_interval_basic.result b/mysql-test/suite/sys_vars/r/aria_checkpoint_interval_basic.result
index a49a5794f11..aa9fc3a974b 100644
--- a/mysql-test/suite/sys_vars/r/aria_checkpoint_interval_basic.result
+++ b/mysql-test/suite/sys_vars/r/aria_checkpoint_interval_basic.result
@@ -34,6 +34,8 @@ select @@global.aria_checkpoint_interval;
 0
 set global aria_checkpoint_interval=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect aria_checkpoint_interval value: '18446744073709551615'
 select @@global.aria_checkpoint_interval;
 @@global.aria_checkpoint_interval
diff --git a/mysql-test/suite/sys_vars/r/aria_group_commit_interval_basic.result b/mysql-test/suite/sys_vars/r/aria_group_commit_interval_basic.result
index 3cec802b3dd..6729d05be05 100644
--- a/mysql-test/suite/sys_vars/r/aria_group_commit_interval_basic.result
+++ b/mysql-test/suite/sys_vars/r/aria_group_commit_interval_basic.result
@@ -34,6 +34,8 @@ select @@global.aria_group_commit_interval;
 0
 set global aria_group_commit_interval=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect aria_group_commit_interval value: '18446744073709551615'
 select @@global.aria_group_commit_interval;
 @@global.aria_group_commit_interval
diff --git a/mysql-test/suite/sys_vars/r/aria_log_file_size_basic.result b/mysql-test/suite/sys_vars/r/aria_log_file_size_basic.result
index ae823df4bf7..8dc7173ccc9 100644
--- a/mysql-test/suite/sys_vars/r/aria_log_file_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/aria_log_file_size_basic.result
@@ -46,6 +46,8 @@ select @@global.aria_log_file_size;
 8396800
 set global aria_log_file_size=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect aria_log_file_size value: '18446744073709551615'
 select @@global.aria_log_file_size;
 @@global.aria_log_file_size
diff --git a/mysql-test/suite/sys_vars/r/aria_max_sort_file_size_basic.result b/mysql-test/suite/sys_vars/r/aria_max_sort_file_size_basic.result
index 83421bfc730..00b45d8e53b 100644
--- a/mysql-test/suite/sys_vars/r/aria_max_sort_file_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/aria_max_sort_file_size_basic.result
@@ -46,6 +46,8 @@ select @@global.aria_max_sort_file_size;
 1048576
 set global aria_max_sort_file_size=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect aria_max_sort_file_size value: '18446744073709551615'
 select @@global.aria_max_sort_file_size;
 @@global.aria_max_sort_file_size
diff --git a/mysql-test/suite/sys_vars/r/aria_pagecache_age_threshold_basic.result b/mysql-test/suite/sys_vars/r/aria_pagecache_age_threshold_basic.result
index cd4fb0a3c26..636351ca83d 100644
--- a/mysql-test/suite/sys_vars/r/aria_pagecache_age_threshold_basic.result
+++ b/mysql-test/suite/sys_vars/r/aria_pagecache_age_threshold_basic.result
@@ -46,6 +46,8 @@ select @@global.aria_pagecache_age_threshold;
 200
 set global aria_pagecache_age_threshold=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect aria_pagecache_age_threshold value: '18446744073709551615'
 select @@global.aria_pagecache_age_threshold;
 @@global.aria_pagecache_age_threshold
diff --git a/mysql-test/suite/sys_vars/r/aria_pagecache_division_limit_basic.result b/mysql-test/suite/sys_vars/r/aria_pagecache_division_limit_basic.result
index 98aae5b3c01..2233092fa41 100644
--- a/mysql-test/suite/sys_vars/r/aria_pagecache_division_limit_basic.result
+++ b/mysql-test/suite/sys_vars/r/aria_pagecache_division_limit_basic.result
@@ -36,6 +36,8 @@ select @@global.aria_pagecache_division_limit;
 1
 set global aria_pagecache_division_limit=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect aria_pagecache_division_limit value: '18446744073709551615'
 select @@global.aria_pagecache_division_limit;
 @@global.aria_pagecache_division_limit
diff --git a/mysql-test/suite/sys_vars/r/aria_repair_threads_basic.result b/mysql-test/suite/sys_vars/r/aria_repair_threads_basic.result
index b070191e212..b9bd498a8cc 100644
--- a/mysql-test/suite/sys_vars/r/aria_repair_threads_basic.result
+++ b/mysql-test/suite/sys_vars/r/aria_repair_threads_basic.result
@@ -38,6 +38,9 @@ select @@global.aria_repair_threads;
 @@global.aria_repair_threads
 1
 set session aria_repair_threads=cast(-1 as unsigned int);
+Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 select @@session.aria_repair_threads;
 @@session.aria_repair_threads
 18446744073709551615
diff --git a/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result
index cf067c7e7b6..3224fff5618 100644
--- a/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result
@@ -38,6 +38,9 @@ select @@global.aria_sort_buffer_size;
 @@global.aria_sort_buffer_size
 4
 set session aria_sort_buffer_size=cast(-1 as unsigned int);
+Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 select @@session.aria_sort_buffer_size;
 @@session.aria_sort_buffer_size
 18446744073709551615
diff --git a/mysql-test/suite/sys_vars/r/binlog_checksum_basic.result b/mysql-test/suite/sys_vars/r/binlog_checksum_basic.result
new file mode 100644
index 00000000000..bfdcaed0e41
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/binlog_checksum_basic.result
@@ -0,0 +1,14 @@
+set @save_binlog_checksum= @@global.binlog_checksum;
+set @@global.binlog_checksum = default;
+select @@global.binlog_checksum as 'must be NONE by default';
+must be NONE by default
+NONE
+select @@session.binlog_checksum as 'no session var';
+ERROR HY000: Variable 'binlog_checksum' is a GLOBAL variable
+set @@global.binlog_checksum = CRC32;
+set @@global.binlog_checksum = CRC32;
+set @@global.master_verify_checksum = 0;
+set @@global.master_verify_checksum = default;
+set @@global.binlog_checksum = ADLER32;
+ERROR 42000: Variable 'binlog_checksum' can't be set to the value of 'ADLER32'
+set @@global.binlog_checksum = @save_binlog_checksum;
diff --git a/mysql-test/suite/sys_vars/r/deadlock_search_depth_long_basic.result b/mysql-test/suite/sys_vars/r/deadlock_search_depth_long_basic.result
index 7b51fa3614a..caf37fd951a 100644
--- a/mysql-test/suite/sys_vars/r/deadlock_search_depth_long_basic.result
+++ b/mysql-test/suite/sys_vars/r/deadlock_search_depth_long_basic.result
@@ -37,6 +37,7 @@ select @@global.deadlock_search_depth_long;
 0
 set session deadlock_search_depth_long=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect deadlock_search_depth_long value: '18446744073709551615'
 select @@session.deadlock_search_depth_long;
 @@session.deadlock_search_depth_long
diff --git a/mysql-test/suite/sys_vars/r/deadlock_search_depth_short_basic.result b/mysql-test/suite/sys_vars/r/deadlock_search_depth_short_basic.result
index 5aab1253c27..7533b4a0dab 100644
--- a/mysql-test/suite/sys_vars/r/deadlock_search_depth_short_basic.result
+++ b/mysql-test/suite/sys_vars/r/deadlock_search_depth_short_basic.result
@@ -37,6 +37,7 @@ select @@global.deadlock_search_depth_short;
 0
 set session deadlock_search_depth_short=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect deadlock_search_depth_short value: '18446744073709551615'
 select @@session.deadlock_search_depth_short;
 @@session.deadlock_search_depth_short
diff --git a/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result b/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result
index 8f76c6d3344..2a8f239dd39 100644
--- a/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result
+++ b/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result
@@ -36,6 +36,8 @@ select @@global.deadlock_timeout_long;
 @@global.deadlock_timeout_long
 0
 set session deadlock_timeout_long=cast(-1 as unsigned int);
+Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 select @@session.deadlock_timeout_long;
 @@session.deadlock_timeout_long
 18446744073709551615
diff --git a/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result b/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result
index f2bf4132bf7..a789594a843 100644
--- a/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result
+++ b/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result
@@ -36,6 +36,8 @@ select @@global.deadlock_timeout_short;
 @@global.deadlock_timeout_short
 0
 set session deadlock_timeout_short=cast(-1 as unsigned int);
+Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 select @@session.deadlock_timeout_short;
 @@session.deadlock_timeout_short
 18446744073709551615
diff --git a/mysql-test/suite/sys_vars/r/debug_crc_break_basic.result b/mysql-test/suite/sys_vars/r/debug_crc_break_basic.result
index 70f338ad305..79cf572ce2e 100644
--- a/mysql-test/suite/sys_vars/r/debug_crc_break_basic.result
+++ b/mysql-test/suite/sys_vars/r/debug_crc_break_basic.result
@@ -33,6 +33,8 @@ select @@global.debug_crc_break;
 @@global.debug_crc_break
 0
 set global debug_crc_break=cast(-1 as unsigned int);
+Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 select @@global.debug_crc_break;
 @@global.debug_crc_break
 18446744073709551615
diff --git a/mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result b/mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result
index 6ae736d14e2..36dc9b6399e 100644
--- a/mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result
+++ b/mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result
@@ -1,15 +1,15 @@
 SET @session_start_value = @@session.engine_condition_pushdown;
 SELECT @session_start_value;
 @session_start_value
-1
+0
 SET @global_start_value = @@global.engine_condition_pushdown;
 SELECT @global_start_value;
 @global_start_value
-1
+0
 select @old_session_opt_switch:=@@session.optimizer_switch,
 @old_global_opt_switch:=@@global.optimizer_switch;
 @old_session_opt_switch:=@@session.optimizer_switch	@old_global_opt_switch:=@@global.optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 '#--------------------FN_DYNVARS_028_01------------------------#'
 SET @@session.engine_condition_pushdown = 0;
 Warnings:
@@ -19,7 +19,7 @@ Warnings:
 Warning	1287	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
 SELECT @@session.engine_condition_pushdown;
 @@session.engine_condition_pushdown
-1
+0
 SET @@global.engine_condition_pushdown = 0;
 Warnings:
 Warning	1287	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
@@ -212,7 +212,7 @@ select @@session.engine_condition_pushdown,
 @@global.engine_condition_pushdown,
 @@session.optimizer_switch, @@global.optimizer_switch;
 @@session.engine_condition_pushdown	@@global.engine_condition_pushdown	@@session.optimizer_switch	@@global.optimizer_switch
-0	0	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+0	0	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 set @@session.engine_condition_pushdown = TRUE;
 Warnings:
 Warning	1287	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
@@ -220,7 +220,7 @@ select @@session.engine_condition_pushdown,
 @@global.engine_condition_pushdown,
 @@session.optimizer_switch, @@global.optimizer_switch;
 @@session.engine_condition_pushdown	@@global.engine_condition_pushdown	@@session.optimizer_switch	@@global.optimizer_switch
-1	0	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+1	0	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=on,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 set @@session.engine_condition_pushdown = FALSE;
 Warnings:
 Warning	1287	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
@@ -228,7 +228,7 @@ select @@session.engine_condition_pushdown,
 @@global.engine_condition_pushdown,
 @@session.optimizer_switch, @@global.optimizer_switch;
 @@session.engine_condition_pushdown	@@global.engine_condition_pushdown	@@session.optimizer_switch	@@global.optimizer_switch
-0	0	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+0	0	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 set @@global.engine_condition_pushdown = TRUE;
 Warnings:
 Warning	1287	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
@@ -236,7 +236,7 @@ select @@session.engine_condition_pushdown,
 @@global.engine_condition_pushdown,
 @@session.optimizer_switch, @@global.optimizer_switch;
 @@session.engine_condition_pushdown	@@global.engine_condition_pushdown	@@session.optimizer_switch	@@global.optimizer_switch
-0	1	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+0	1	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=on,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 set @@global.engine_condition_pushdown = FALSE;
 Warnings:
 Warning	1287	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
@@ -244,47 +244,47 @@ select @@session.engine_condition_pushdown,
 @@global.engine_condition_pushdown,
 @@session.optimizer_switch, @@global.optimizer_switch;
 @@session.engine_condition_pushdown	@@global.engine_condition_pushdown	@@session.optimizer_switch	@@global.optimizer_switch
-0	0	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+0	0	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 set @@session.optimizer_switch = "engine_condition_pushdown=on";
 select @@session.engine_condition_pushdown,
 @@global.engine_condition_pushdown,
 @@session.optimizer_switch, @@global.optimizer_switch;
 @@session.engine_condition_pushdown	@@global.engine_condition_pushdown	@@session.optimizer_switch	@@global.optimizer_switch
-1	0	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+1	0	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=on,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 set @@session.optimizer_switch = "engine_condition_pushdown=off";
 select @@session.engine_condition_pushdown,
 @@global.engine_condition_pushdown,
 @@session.optimizer_switch, @@global.optimizer_switch;
 @@session.engine_condition_pushdown	@@global.engine_condition_pushdown	@@session.optimizer_switch	@@global.optimizer_switch
-0	0	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+0	0	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 set @@global.optimizer_switch = "engine_condition_pushdown=on";
 select @@session.engine_condition_pushdown,
 @@global.engine_condition_pushdown,
 @@session.optimizer_switch, @@global.optimizer_switch;
 @@session.engine_condition_pushdown	@@global.engine_condition_pushdown	@@session.optimizer_switch	@@global.optimizer_switch
-0	1	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+0	1	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=on,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 set @@global.optimizer_switch = "engine_condition_pushdown=off";
 select @@session.engine_condition_pushdown,
 @@global.engine_condition_pushdown,
 @@session.optimizer_switch, @@global.optimizer_switch;
 @@session.engine_condition_pushdown	@@global.engine_condition_pushdown	@@session.optimizer_switch	@@global.optimizer_switch
-0	0	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+0	0	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 SET @@session.engine_condition_pushdown = @session_start_value;
 Warnings:
 Warning	1287	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
 SELECT @@session.engine_condition_pushdown;
 @@session.engine_condition_pushdown
-1
+0
 SET @@global.engine_condition_pushdown = @global_start_value;
 Warnings:
 Warning	1287	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
 SELECT @@global.engine_condition_pushdown;
 @@global.engine_condition_pushdown
-1
+0
 set @session.optimizer_switch=@old_session_opt_switch,
 @@global.optimizer_switch=@old_global_opt_switch;
 select @@session.engine_condition_pushdown,
 @@global.engine_condition_pushdown,
 @@session.optimizer_switch, @@global.optimizer_switch;
 @@session.engine_condition_pushdown	@@global.engine_condition_pushdown	@@session.optimizer_switch	@@global.optimizer_switch
-1	1	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+0	0	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
diff --git a/mysql-test/suite/sys_vars/r/extra_max_connections_basic.result b/mysql-test/suite/sys_vars/r/extra_max_connections_basic.result
index 353271cabb2..4b4f951bc69 100644
--- a/mysql-test/suite/sys_vars/r/extra_max_connections_basic.result
+++ b/mysql-test/suite/sys_vars/r/extra_max_connections_basic.result
@@ -36,6 +36,7 @@ select @@global.extra_max_connections;
 1
 set global extra_max_connections=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect extra_max_connections value: '18446744073709551615'
 select @@global.extra_max_connections;
 @@global.extra_max_connections
diff --git a/mysql-test/suite/sys_vars/r/flush_time_basic.result b/mysql-test/suite/sys_vars/r/flush_time_basic.result
index 8dac3bbdb1e..45d0f74aa65 100644
--- a/mysql-test/suite/sys_vars/r/flush_time_basic.result
+++ b/mysql-test/suite/sys_vars/r/flush_time_basic.result
@@ -34,6 +34,7 @@ select @@global.flush_time;
 0
 set global flush_time=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect flush_time value: '18446744073709551615'
 select @@global.flush_time;
 @@global.flush_time
diff --git a/mysql-test/suite/sys_vars/r/general_log_file_basic.result b/mysql-test/suite/sys_vars/r/general_log_file_basic.result
index 611e0f80d86..0f211c6b321 100644
--- a/mysql-test/suite/sys_vars/r/general_log_file_basic.result
+++ b/mysql-test/suite/sys_vars/r/general_log_file_basic.result
@@ -4,10 +4,9 @@ SELECT @start_value;
 test.log
 '#---------------------FN_DYNVARS_004_01-------------------------#'
 SET @@global.general_log_file = DEFAULT;
-SET @a=concat(left(@@hostname, instr(concat(@@hostname, '.'), '.')-1), '.log');
-SELECT RIGHT(@@global.general_log_file, length(@a)) = @a;
-RIGHT(@@global.general_log_file, length(@a)) = @a
-1
+SELECT @@global.general_log_file;
+@@global.general_log_file
+mysqld.log
 '#--------------------FN_DYNVARS_004_02------------------------#'
 SET @@global.general_log_file = mytest.log;
 SET @@global.general_log_file = 12;
diff --git a/mysql-test/suite/sys_vars/r/join_cache_level_basic.result b/mysql-test/suite/sys_vars/r/join_cache_level_basic.result
index fecc886d460..491aeacb4c0 100644
--- a/mysql-test/suite/sys_vars/r/join_cache_level_basic.result
+++ b/mysql-test/suite/sys_vars/r/join_cache_level_basic.result
@@ -37,6 +37,7 @@ select @@global.join_cache_level;
 0
 set session join_cache_level=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect join_cache_level value: '18446744073709551615'
 select @@session.join_cache_level;
 @@session.join_cache_level
diff --git a/mysql-test/suite/sys_vars/r/key_cache_segments_basic.result b/mysql-test/suite/sys_vars/r/key_cache_segments_basic.result
index 55590b270e9..a60e717970e 100644
--- a/mysql-test/suite/sys_vars/r/key_cache_segments_basic.result
+++ b/mysql-test/suite/sys_vars/r/key_cache_segments_basic.result
@@ -34,6 +34,7 @@ select @@global.key_cache_segments;
 0
 set global key_cache_segments=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect key_cache_segments value: '18446744073709551615'
 select @@global.key_cache_segments;
 @@global.key_cache_segments
diff --git a/mysql-test/suite/sys_vars/r/log_output_func.result b/mysql-test/suite/sys_vars/r/log_output_func.result
index 060f930a161..24703f4317b 100644
--- a/mysql-test/suite/sys_vars/r/log_output_func.result
+++ b/mysql-test/suite/sys_vars/r/log_output_func.result
@@ -1,6 +1,5 @@
 SET @start_value= @@global.log_output;
 SET @start_general_log= @@global.general_log;
-SET @start_general_log_file= @@global.general_log_file;
 '#--------------------FN_DYNVARS_065_01-------------------------#'
 SET @@global.log_output = 'NONE';
 'connect (con1,localhost,root,,,,)'
@@ -53,7 +52,7 @@ count(*)
 DROP TABLE t1;
 connection default;
 SET @@global.general_log= 'OFF';
-SET @@global.general_log_file= @start_general_log_file;
+SET @@global.general_log_file= 'start_general_log_file';
 SET @@global.log_output= @start_value;
 SET @@global.general_log= @start_general_log;
 SET @@global.general_log= 'ON';
diff --git a/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result
index ec47f5e0a30..8711d914980 100644
--- a/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result
+++ b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result
@@ -38,6 +38,8 @@ select @@global.log_slow_rate_limit;
 @@global.log_slow_rate_limit
 1
 set session log_slow_rate_limit=cast(-1 as unsigned int);
+Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 select @@session.log_slow_rate_limit;
 @@session.log_slow_rate_limit
 18446744073709551615
diff --git a/mysql-test/suite/sys_vars/r/maria_block_size_basic.result b/mysql-test/suite/sys_vars/r/maria_block_size_basic.result
deleted file mode 100644
index a0842541534..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_block_size_basic.result
+++ /dev/null
@@ -1,25 +0,0 @@
-select @@global.maria_block_size, @@global.aria_block_size;
-@@global.maria_block_size	@@global.aria_block_size
-8192	8192
-select @@session.maria_block_size, @@session.aria_block_size;
-ERROR HY000: Variable 'maria_block_size' is a GLOBAL variable
-show global variables like '%aria_block_size';
-Variable_name	Value
-aria_block_size	8192
-maria_block_size	8192
-show session variables like '%aria_block_size';
-Variable_name	Value
-aria_block_size	8192
-maria_block_size	8192
-select * from information_schema.global_variables where variable_name like '%aria_block_size';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_BLOCK_SIZE	8192
-MARIA_BLOCK_SIZE	8192
-select * from information_schema.session_variables where variable_name like '%aria_block_size';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_BLOCK_SIZE	8192
-MARIA_BLOCK_SIZE	8192
-set global maria_block_size=1;
-ERROR HY000: Variable 'maria_block_size' is a read only variable
-set session maria_block_size=1;
-ERROR HY000: Variable 'maria_block_size' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/maria_checkpoint_interval_basic.result b/mysql-test/suite/sys_vars/r/maria_checkpoint_interval_basic.result
deleted file mode 100644
index 0a60303c7d5..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_checkpoint_interval_basic.result
+++ /dev/null
@@ -1,43 +0,0 @@
-SET @start_global_value = @@global.maria_checkpoint_interval;
-select @@global.maria_checkpoint_interval, @@global.aria_checkpoint_interval;
-@@global.maria_checkpoint_interval	@@global.aria_checkpoint_interval
-30	30
-select @@session.maria_checkpoint_interval, @@session.aria_checkpoint_interval;
-ERROR HY000: Variable 'maria_checkpoint_interval' is a GLOBAL variable
-show global variables like '%aria_checkpoint_interval';
-Variable_name	Value
-aria_checkpoint_interval	30
-maria_checkpoint_interval	30
-show session variables like '%aria_checkpoint_interval';
-Variable_name	Value
-aria_checkpoint_interval	30
-maria_checkpoint_interval	30
-select * from information_schema.global_variables where variable_name='maria_checkpoint_interval';
-VARIABLE_NAME	VARIABLE_VALUE
-MARIA_CHECKPOINT_INTERVAL	30
-select * from information_schema.session_variables where variable_name='maria_checkpoint_interval';
-VARIABLE_NAME	VARIABLE_VALUE
-MARIA_CHECKPOINT_INTERVAL	30
-set global maria_checkpoint_interval=1;
-select @@global.maria_checkpoint_interval, @@global.aria_checkpoint_interval;
-@@global.maria_checkpoint_interval	@@global.aria_checkpoint_interval
-1	1
-set session maria_checkpoint_interval=1;
-ERROR HY000: Variable 'maria_checkpoint_interval' is a GLOBAL variable and should be set with SET GLOBAL
-set global maria_checkpoint_interval=1.1;
-ERROR 42000: Incorrect argument type to variable 'maria_checkpoint_interval'
-set global maria_checkpoint_interval=1e1;
-ERROR 42000: Incorrect argument type to variable 'maria_checkpoint_interval'
-set global maria_checkpoint_interval="foo";
-ERROR 42000: Incorrect argument type to variable 'maria_checkpoint_interval'
-set global maria_checkpoint_interval=0;
-select @@global.maria_checkpoint_interval, @@global.aria_checkpoint_interval;
-@@global.maria_checkpoint_interval	@@global.aria_checkpoint_interval
-0	0
-set global maria_checkpoint_interval=cast(-1 as unsigned int);
-Warnings:
-Warning	1292	Truncated incorrect aria_checkpoint_interval value: '18446744073709551615'
-select @@global.maria_checkpoint_interval, @@global.aria_checkpoint_interval;
-@@global.maria_checkpoint_interval	@@global.aria_checkpoint_interval
-4294967295	4294967295
-SET @@global.maria_checkpoint_interval = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/maria_force_start_after_recovery_failures_basic.result b/mysql-test/suite/sys_vars/r/maria_force_start_after_recovery_failures_basic.result
deleted file mode 100644
index f4bbd134df3..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_force_start_after_recovery_failures_basic.result
+++ /dev/null
@@ -1,23 +0,0 @@
-select @@global.maria_force_start_after_recovery_failures, @@global.aria_force_start_after_recovery_failures;
-@@global.maria_force_start_after_recovery_failures	@@global.aria_force_start_after_recovery_failures
-0	0
-select @@session.maria_force_start_after_recovery_failures, @@session.aria_force_start_after_recovery_failures;
-ERROR HY000: Variable 'maria_force_start_after_recovery_failures' is a GLOBAL variable
-show global variables like '%aria_force_start_after_recovery_failures';
-Variable_name	Value
-aria_force_start_after_recovery_failures	0
-maria_force_start_after_recovery_failures	0
-show session variables like '%aria_force_start_after_recovery_failures';
-Variable_name	Value
-aria_force_start_after_recovery_failures	0
-maria_force_start_after_recovery_failures	0
-select * from information_schema.global_variables where variable_name='maria_force_start_after_recovery_failures';
-VARIABLE_NAME	VARIABLE_VALUE
-MARIA_FORCE_START_AFTER_RECOVERY_FAILURES	0
-select * from information_schema.session_variables where variable_name='maria_force_start_after_recovery_failures';
-VARIABLE_NAME	VARIABLE_VALUE
-MARIA_FORCE_START_AFTER_RECOVERY_FAILURES	0
-set global maria_force_start_after_recovery_failures=1;
-ERROR HY000: Variable 'maria_force_start_after_recovery_failures' is a read only variable
-set session maria_force_start_after_recovery_failures=1;
-ERROR HY000: Variable 'maria_force_start_after_recovery_failures' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/maria_group_commit_basic.result b/mysql-test/suite/sys_vars/r/maria_group_commit_basic.result
deleted file mode 100644
index 7e97d379403..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_group_commit_basic.result
+++ /dev/null
@@ -1,47 +0,0 @@
-SET @start_global_value = @@global.maria_group_commit;
-select @@global.maria_group_commit, @@global.aria_group_commit;
-@@global.maria_group_commit	@@global.aria_group_commit
-none	none
-select @@session.maria_group_commit, @@session.aria_group_commit;
-ERROR HY000: Variable 'maria_group_commit' is a GLOBAL variable
-show global variables like '%aria_group_commit';
-Variable_name	Value
-aria_group_commit	none
-maria_group_commit	none
-show session variables like '%aria_group_commit';
-Variable_name	Value
-aria_group_commit	none
-maria_group_commit	none
-select * from information_schema.global_variables where variable_name='maria_group_commit';
-VARIABLE_NAME	VARIABLE_VALUE
-MARIA_GROUP_COMMIT	none
-select * from information_schema.session_variables where variable_name='maria_group_commit';
-VARIABLE_NAME	VARIABLE_VALUE
-MARIA_GROUP_COMMIT	none
-set global maria_group_commit=1;
-select @@global.maria_group_commit, @@global.aria_group_commit;
-@@global.maria_group_commit	@@global.aria_group_commit
-hard	hard
-set session maria_group_commit=1;
-ERROR HY000: Variable 'maria_group_commit' is a GLOBAL variable and should be set with SET GLOBAL
-set global maria_group_commit=none;
-select @@global.maria_group_commit, @@global.aria_group_commit;
-@@global.maria_group_commit	@@global.aria_group_commit
-none	none
-set global maria_group_commit=hard;
-select @@global.maria_group_commit, @@global.aria_group_commit;
-@@global.maria_group_commit	@@global.aria_group_commit
-hard	hard
-set global maria_group_commit=soft;
-select @@global.maria_group_commit, @@global.aria_group_commit;
-@@global.maria_group_commit	@@global.aria_group_commit
-soft	soft
-set global maria_group_commit=1.1;
-ERROR 42000: Incorrect argument type to variable 'maria_group_commit'
-set global maria_group_commit=1e1;
-ERROR 42000: Incorrect argument type to variable 'maria_group_commit'
-set global maria_group_commit="foo";
-ERROR 42000: Variable 'maria_group_commit' can't be set to the value of 'foo'
-set global maria_group_commit=3;
-ERROR 42000: Variable 'maria_group_commit' can't be set to the value of '3'
-SET @@global.maria_group_commit = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/maria_group_commit_interval_basic.result b/mysql-test/suite/sys_vars/r/maria_group_commit_interval_basic.result
deleted file mode 100644
index 23ae3ac7e82..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_group_commit_interval_basic.result
+++ /dev/null
@@ -1,43 +0,0 @@
-SET @start_global_value = @@global.maria_group_commit_interval;
-select @@global.maria_group_commit_interval, @@global.aria_group_commit_interval;
-@@global.maria_group_commit_interval	@@global.aria_group_commit_interval
-0	0
-select @@session.maria_group_commit_interval, @@session.aria_group_commit_interval;
-ERROR HY000: Variable 'maria_group_commit_interval' is a GLOBAL variable
-show global variables like '%aria_group_commit_interval';
-Variable_name	Value
-aria_group_commit_interval	0
-maria_group_commit_interval	0
-show session variables like '%aria_group_commit_interval';
-Variable_name	Value
-aria_group_commit_interval	0
-maria_group_commit_interval	0
-select * from information_schema.global_variables where variable_name='maria_group_commit_interval';
-VARIABLE_NAME	VARIABLE_VALUE
-MARIA_GROUP_COMMIT_INTERVAL	0
-select * from information_schema.session_variables where variable_name='maria_group_commit_interval';
-VARIABLE_NAME	VARIABLE_VALUE
-MARIA_GROUP_COMMIT_INTERVAL	0
-set global maria_group_commit_interval=1;
-select @@global.maria_group_commit_interval, @@global.aria_group_commit_interval;
-@@global.maria_group_commit_interval	@@global.aria_group_commit_interval
-1	1
-set session maria_group_commit_interval=1;
-ERROR HY000: Variable 'maria_group_commit_interval' is a GLOBAL variable and should be set with SET GLOBAL
-set global maria_group_commit_interval=1.1;
-ERROR 42000: Incorrect argument type to variable 'maria_group_commit_interval'
-set global maria_group_commit_interval=1e1;
-ERROR 42000: Incorrect argument type to variable 'maria_group_commit_interval'
-set global maria_group_commit_interval="foo";
-ERROR 42000: Incorrect argument type to variable 'maria_group_commit_interval'
-set global maria_group_commit_interval=0;
-select @@global.maria_group_commit_interval, @@global.aria_group_commit_interval;
-@@global.maria_group_commit_interval	@@global.aria_group_commit_interval
-0	0
-set global maria_group_commit_interval=cast(-1 as unsigned int);
-Warnings:
-Warning	1292	Truncated incorrect aria_group_commit_interval value: '18446744073709551615'
-select @@global.maria_group_commit_interval, @@global.aria_group_commit_interval;
-@@global.maria_group_commit_interval	@@global.aria_group_commit_interval
-4294967295	4294967295
-SET @@global.maria_group_commit_interval = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/maria_log_file_size_basic.result b/mysql-test/suite/sys_vars/r/maria_log_file_size_basic.result
deleted file mode 100644
index 33945ab1ae7..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_log_file_size_basic.result
+++ /dev/null
@@ -1,57 +0,0 @@
-SET @start_global_value = @@global.maria_log_file_size;
-select @@global.maria_log_file_size, @@global.aria_log_file_size;
-@@global.maria_log_file_size	@@global.aria_log_file_size
-1073741824	1073741824
-select @@session.maria_log_file_size, @@session.aria_log_file_size;
-ERROR HY000: Variable 'maria_log_file_size' is a GLOBAL variable
-show global variables like '%aria_log_file_size';
-Variable_name	Value
-aria_log_file_size	1073741824
-maria_log_file_size	1073741824
-show session variables like '%aria_log_file_size';
-Variable_name	Value
-aria_log_file_size	1073741824
-maria_log_file_size	1073741824
-select * from information_schema.global_variables where variable_name like '%aria_log_file_size';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_LOG_FILE_SIZE	1073741824
-MARIA_LOG_FILE_SIZE	1073741824
-select * from information_schema.session_variables where variable_name like '%aria_log_file_size';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_LOG_FILE_SIZE	1073741824
-MARIA_LOG_FILE_SIZE	1073741824
-set global maria_log_file_size=1024*1024*10;
-select @@global.maria_log_file_size, @@global.aria_log_file_size;
-@@global.maria_log_file_size	@@global.aria_log_file_size
-10485760	10485760
-set session maria_log_file_size=1;
-ERROR HY000: Variable 'maria_log_file_size' is a GLOBAL variable and should be set with SET GLOBAL
-set global maria_log_file_size=1.1;
-ERROR 42000: Incorrect argument type to variable 'maria_log_file_size'
-set global maria_log_file_size=1e1;
-ERROR 42000: Incorrect argument type to variable 'maria_log_file_size'
-set global maria_log_file_size="foo";
-ERROR 42000: Incorrect argument type to variable 'maria_log_file_size'
-set global maria_log_file_size=1;
-Warnings:
-Warning	1292	Truncated incorrect aria_log_file_size value: '1'
-select @@global.maria_log_file_size, @@global.aria_log_file_size;
-@@global.maria_log_file_size	@@global.aria_log_file_size
-8388608	8388608
-set global maria_log_file_size=@@global.maria_log_file_size + 8192 - 1;
-Warnings:
-Warning	1292	Truncated incorrect aria_log_file_size value: '8396799'
-select @@global.maria_log_file_size, @@global.aria_log_file_size;
-@@global.maria_log_file_size	@@global.aria_log_file_size
-8388608	8388608
-set global maria_log_file_size=@@global.maria_log_file_size + 8192;
-select @@global.maria_log_file_size, @@global.aria_log_file_size;
-@@global.maria_log_file_size	@@global.aria_log_file_size
-8396800	8396800
-set global maria_log_file_size=cast(-1 as unsigned int);
-Warnings:
-Warning	1292	Truncated incorrect aria_log_file_size value: '18446744073709551615'
-select @@global.maria_log_file_size, @@global.aria_log_file_size;
-@@global.maria_log_file_size	@@global.aria_log_file_size
-4294959104	4294959104
-SET @@global.maria_log_file_size = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/maria_log_purge_type_basic.result b/mysql-test/suite/sys_vars/r/maria_log_purge_type_basic.result
deleted file mode 100644
index 519c41ae46d..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_log_purge_type_basic.result
+++ /dev/null
@@ -1,49 +0,0 @@
-SET @start_global_value = @@global.maria_log_purge_type;
-select @@global.maria_log_purge_type, @@global.aria_log_purge_type;
-@@global.maria_log_purge_type	@@global.aria_log_purge_type
-immediate	immediate
-select @@session.maria_log_purge_type, @@session.aria_log_purge_type;
-ERROR HY000: Variable 'maria_log_purge_type' is a GLOBAL variable
-show global variables like '%aria_log_purge_type';
-Variable_name	Value
-aria_log_purge_type	immediate
-maria_log_purge_type	immediate
-show session variables like '%aria_log_purge_type';
-Variable_name	Value
-aria_log_purge_type	immediate
-maria_log_purge_type	immediate
-select * from information_schema.global_variables where variable_name like '%aria_log_purge_type';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_LOG_PURGE_TYPE	immediate
-MARIA_LOG_PURGE_TYPE	immediate
-select * from information_schema.session_variables where variable_name like '%aria_log_purge_type';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_LOG_PURGE_TYPE	immediate
-MARIA_LOG_PURGE_TYPE	immediate
-set global maria_log_purge_type=1;
-select @@global.maria_log_purge_type, @@global.aria_log_purge_type;
-@@global.maria_log_purge_type	@@global.aria_log_purge_type
-external	external
-set session maria_log_purge_type=1;
-ERROR HY000: Variable 'maria_log_purge_type' is a GLOBAL variable and should be set with SET GLOBAL
-set global maria_log_purge_type=immediate;
-select @@global.maria_log_purge_type, @@global.aria_log_purge_type;
-@@global.maria_log_purge_type	@@global.aria_log_purge_type
-immediate	immediate
-set global maria_log_purge_type=external;
-select @@global.maria_log_purge_type, @@global.aria_log_purge_type;
-@@global.maria_log_purge_type	@@global.aria_log_purge_type
-external	external
-set global maria_log_purge_type=at_flush;
-select @@global.maria_log_purge_type, @@global.aria_log_purge_type;
-@@global.maria_log_purge_type	@@global.aria_log_purge_type
-at_flush	at_flush
-set global maria_log_purge_type=1.1;
-ERROR 42000: Incorrect argument type to variable 'maria_log_purge_type'
-set global maria_log_purge_type=1e1;
-ERROR 42000: Incorrect argument type to variable 'maria_log_purge_type'
-set global maria_log_purge_type="foo";
-ERROR 42000: Variable 'maria_log_purge_type' can't be set to the value of 'foo'
-set global maria_log_purge_type=3;
-ERROR 42000: Variable 'maria_log_purge_type' can't be set to the value of '3'
-SET @@global.maria_log_purge_type = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/maria_max_sort_file_size_basic.result b/mysql-test/suite/sys_vars/r/maria_max_sort_file_size_basic.result
deleted file mode 100644
index 1e11f8ee5a9..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_max_sort_file_size_basic.result
+++ /dev/null
@@ -1,57 +0,0 @@
-SET @start_global_value = @@global.maria_max_sort_file_size;
-select @@global.maria_max_sort_file_size, @@global.aria_max_sort_file_size;
-@@global.maria_max_sort_file_size	@@global.aria_max_sort_file_size
-9223372036853727232	9223372036853727232
-select @@session.maria_max_sort_file_size, @@session.aria_max_sort_file_size;
-ERROR HY000: Variable 'maria_max_sort_file_size' is a GLOBAL variable
-show global variables like '%aria_max_sort_file_size';
-Variable_name	Value
-aria_max_sort_file_size	9223372036853727232
-maria_max_sort_file_size	9223372036853727232
-show session variables like '%aria_max_sort_file_size';
-Variable_name	Value
-aria_max_sort_file_size	9223372036853727232
-maria_max_sort_file_size	9223372036853727232
-select * from information_schema.global_variables where variable_name like '%aria_max_sort_file_size';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_MAX_SORT_FILE_SIZE	9223372036853727232
-MARIA_MAX_SORT_FILE_SIZE	9223372036853727232
-select * from information_schema.session_variables where variable_name like '%aria_max_sort_file_size';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_MAX_SORT_FILE_SIZE	9223372036853727232
-MARIA_MAX_SORT_FILE_SIZE	9223372036853727232
-set global maria_max_sort_file_size=1024*1024*10;
-select @@global.maria_max_sort_file_size, @@global.aria_max_sort_file_size;
-@@global.maria_max_sort_file_size	@@global.aria_max_sort_file_size
-10485760	10485760
-set session maria_max_sort_file_size=1;
-ERROR HY000: Variable 'maria_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
-set global maria_max_sort_file_size=1.1;
-ERROR 42000: Incorrect argument type to variable 'maria_max_sort_file_size'
-set global maria_max_sort_file_size=1e1;
-ERROR 42000: Incorrect argument type to variable 'maria_max_sort_file_size'
-set global maria_max_sort_file_size="foo";
-ERROR 42000: Incorrect argument type to variable 'maria_max_sort_file_size'
-set global maria_max_sort_file_size=1;
-Warnings:
-Warning	1292	Truncated incorrect aria_max_sort_file_size value: '1'
-select @@global.maria_max_sort_file_size, @@global.aria_max_sort_file_size;
-@@global.maria_max_sort_file_size	@@global.aria_max_sort_file_size
-0	0
-set global maria_max_sort_file_size=@@global.maria_max_sort_file_size + 1024*1024 - 1;
-Warnings:
-Warning	1292	Truncated incorrect aria_max_sort_file_size value: '1048575'
-select @@global.maria_max_sort_file_size, @@global.aria_max_sort_file_size;
-@@global.maria_max_sort_file_size	@@global.aria_max_sort_file_size
-0	0
-set global maria_max_sort_file_size=@@global.maria_max_sort_file_size + 1024*1024;
-select @@global.maria_max_sort_file_size, @@global.aria_max_sort_file_size;
-@@global.maria_max_sort_file_size	@@global.aria_max_sort_file_size
-1048576	1048576
-set global maria_max_sort_file_size=cast(-1 as unsigned int);
-Warnings:
-Warning	1292	Truncated incorrect aria_max_sort_file_size value: '18446744073709551615'
-select @@global.maria_max_sort_file_size, @@global.aria_max_sort_file_size;
-@@global.maria_max_sort_file_size	@@global.aria_max_sort_file_size
-9223372036853727232	9223372036853727232
-SET @@global.maria_max_sort_file_size = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/maria_page_checksum_basic.result b/mysql-test/suite/sys_vars/r/maria_page_checksum_basic.result
deleted file mode 100644
index 01cb1ea9a9d..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_page_checksum_basic.result
+++ /dev/null
@@ -1,43 +0,0 @@
-SET @start_global_value = @@global.maria_page_checksum;
-select @@global.maria_page_checksum, @@global.aria_page_checksum;
-@@global.maria_page_checksum	@@global.aria_page_checksum
-1	1
-select @@session.maria_page_checksum, @@session.aria_page_checksum;
-ERROR HY000: Variable 'maria_page_checksum' is a GLOBAL variable
-show global variables like '%aria_page_checksum';
-Variable_name	Value
-aria_page_checksum	ON
-maria_page_checksum	ON
-show session variables like '%aria_page_checksum';
-Variable_name	Value
-aria_page_checksum	ON
-maria_page_checksum	ON
-select * from information_schema.global_variables where variable_name like '%aria_page_checksum';
-VARIABLE_NAME	VARIABLE_VALUE
-MARIA_PAGE_CHECKSUM	ON
-ARIA_PAGE_CHECKSUM	ON
-select * from information_schema.session_variables where variable_name like '%aria_page_checksum';
-VARIABLE_NAME	VARIABLE_VALUE
-MARIA_PAGE_CHECKSUM	ON
-ARIA_PAGE_CHECKSUM	ON
-set global maria_page_checksum=ON;
-select @@global.maria_page_checksum, @@global.aria_page_checksum;
-@@global.maria_page_checksum	@@global.aria_page_checksum
-1	1
-set global maria_page_checksum=OFF;
-select @@global.maria_page_checksum, @@global.aria_page_checksum;
-@@global.maria_page_checksum	@@global.aria_page_checksum
-0	0
-set global maria_page_checksum=1;
-select @@global.maria_page_checksum, @@global.aria_page_checksum;
-@@global.maria_page_checksum	@@global.aria_page_checksum
-1	1
-set session maria_page_checksum=1;
-ERROR HY000: Variable 'maria_page_checksum' is a GLOBAL variable and should be set with SET GLOBAL
-set global maria_page_checksum=1.1;
-ERROR 42000: Incorrect argument type to variable 'maria_page_checksum'
-set global maria_page_checksum=1e1;
-ERROR 42000: Incorrect argument type to variable 'maria_page_checksum'
-set global maria_page_checksum="foo";
-ERROR 42000: Variable 'maria_page_checksum' can't be set to the value of 'foo'
-SET @@global.maria_page_checksum = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/maria_pagecache_age_threshold_basic.result b/mysql-test/suite/sys_vars/r/maria_pagecache_age_threshold_basic.result
deleted file mode 100644
index c00bbfb1adf..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_pagecache_age_threshold_basic.result
+++ /dev/null
@@ -1,57 +0,0 @@
-SET @start_global_value = @@global.maria_pagecache_age_threshold;
-select @@global.maria_pagecache_age_threshold, @@global.aria_pagecache_age_threshold;
-@@global.maria_pagecache_age_threshold	@@global.aria_pagecache_age_threshold
-300	300
-select @@session.maria_pagecache_age_threshold, @@session.aria_pagecache_age_threshold;
-ERROR HY000: Variable 'maria_pagecache_age_threshold' is a GLOBAL variable
-show global variables like '%aria_pagecache_age_threshold';
-Variable_name	Value
-aria_pagecache_age_threshold	300
-maria_pagecache_age_threshold	300
-show session variables like '%aria_pagecache_age_threshold';
-Variable_name	Value
-aria_pagecache_age_threshold	300
-maria_pagecache_age_threshold	300
-select * from information_schema.global_variables where variable_name like '%aria_pagecache_age_threshold';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_PAGECACHE_AGE_THRESHOLD	300
-MARIA_PAGECACHE_AGE_THRESHOLD	300
-select * from information_schema.session_variables where variable_name like '%aria_pagecache_age_threshold';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_PAGECACHE_AGE_THRESHOLD	300
-MARIA_PAGECACHE_AGE_THRESHOLD	300
-set global maria_pagecache_age_threshold=200;
-select @@global.maria_pagecache_age_threshold, @@global.aria_pagecache_age_threshold;
-@@global.maria_pagecache_age_threshold	@@global.aria_pagecache_age_threshold
-200	200
-set session maria_pagecache_age_threshold=1;
-ERROR HY000: Variable 'maria_pagecache_age_threshold' is a GLOBAL variable and should be set with SET GLOBAL
-set global maria_pagecache_age_threshold=1.1;
-ERROR 42000: Incorrect argument type to variable 'maria_pagecache_age_threshold'
-set global maria_pagecache_age_threshold=1e1;
-ERROR 42000: Incorrect argument type to variable 'maria_pagecache_age_threshold'
-set global maria_pagecache_age_threshold="foo";
-ERROR 42000: Incorrect argument type to variable 'maria_pagecache_age_threshold'
-set global maria_pagecache_age_threshold=1;
-Warnings:
-Warning	1292	Truncated incorrect aria_pagecache_age_threshold value: '1'
-select @@global.maria_pagecache_age_threshold, @@global.aria_pagecache_age_threshold;
-@@global.maria_pagecache_age_threshold	@@global.aria_pagecache_age_threshold
-100	100
-set global maria_pagecache_age_threshold=@@global.maria_pagecache_age_threshold + 100 - 1;
-Warnings:
-Warning	1292	Truncated incorrect aria_pagecache_age_threshold value: '199'
-select @@global.maria_pagecache_age_threshold, @@global.aria_pagecache_age_threshold;
-@@global.maria_pagecache_age_threshold	@@global.aria_pagecache_age_threshold
-100	100
-set global maria_pagecache_age_threshold=@@global.maria_pagecache_age_threshold + 100;
-select @@global.maria_pagecache_age_threshold, @@global.aria_pagecache_age_threshold;
-@@global.maria_pagecache_age_threshold	@@global.aria_pagecache_age_threshold
-200	200
-set global maria_pagecache_age_threshold=cast(-1 as unsigned int);
-Warnings:
-Warning	1292	Truncated incorrect aria_pagecache_age_threshold value: '18446744073709551615'
-select @@global.maria_pagecache_age_threshold, @@global.aria_pagecache_age_threshold;
-@@global.maria_pagecache_age_threshold	@@global.aria_pagecache_age_threshold
-18446744073709551600	18446744073709551600
-SET @@global.maria_pagecache_age_threshold = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/maria_pagecache_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/maria_pagecache_buffer_size_basic.result
deleted file mode 100644
index a2b98f6d536..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_pagecache_buffer_size_basic.result
+++ /dev/null
@@ -1,25 +0,0 @@
-select @@global.maria_pagecache_buffer_size, @@global.aria_pagecache_buffer_size;
-@@global.maria_pagecache_buffer_size	@@global.aria_pagecache_buffer_size
-134217728	134217728
-select @@session.maria_pagecache_buffer_size, @@session.aria_pagecache_buffer_size;
-ERROR HY000: Variable 'maria_pagecache_buffer_size' is a GLOBAL variable
-show global variables like '%aria_pagecache_buffer_size';
-Variable_name	Value
-aria_pagecache_buffer_size	134217728
-maria_pagecache_buffer_size	134217728
-show session variables like '%aria_pagecache_buffer_size';
-Variable_name	Value
-aria_pagecache_buffer_size	134217728
-maria_pagecache_buffer_size	134217728
-select * from information_schema.global_variables where variable_name like '%aria_pagecache_buffer_size';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_PAGECACHE_BUFFER_SIZE	134217728
-MARIA_PAGECACHE_BUFFER_SIZE	134217728
-select * from information_schema.session_variables where variable_name like '%aria_pagecache_buffer_size';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_PAGECACHE_BUFFER_SIZE	134217728
-MARIA_PAGECACHE_BUFFER_SIZE	134217728
-set global maria_pagecache_buffer_size=1;
-ERROR HY000: Variable 'maria_pagecache_buffer_size' is a read only variable
-set session maria_pagecache_buffer_size=1;
-ERROR HY000: Variable 'maria_pagecache_buffer_size' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/maria_pagecache_division_limit_basic.result b/mysql-test/suite/sys_vars/r/maria_pagecache_division_limit_basic.result
deleted file mode 100644
index 46fbb93e81b..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_pagecache_division_limit_basic.result
+++ /dev/null
@@ -1,47 +0,0 @@
-SET @start_global_value = @@global.maria_pagecache_division_limit;
-select @@global.maria_pagecache_division_limit, @@global.aria_pagecache_division_limit;
-@@global.maria_pagecache_division_limit	@@global.aria_pagecache_division_limit
-100	100
-select @@session.maria_pagecache_division_limit, @@session.aria_pagecache_division_limit;
-ERROR HY000: Variable 'maria_pagecache_division_limit' is a GLOBAL variable
-show global variables like '%aria_pagecache_division_limit';
-Variable_name	Value
-aria_pagecache_division_limit	100
-maria_pagecache_division_limit	100
-show session variables like '%aria_pagecache_division_limit';
-Variable_name	Value
-aria_pagecache_division_limit	100
-maria_pagecache_division_limit	100
-select * from information_schema.global_variables where variable_name like '%aria_pagecache_division_limit';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_PAGECACHE_DIVISION_LIMIT	100
-MARIA_PAGECACHE_DIVISION_LIMIT	100
-select * from information_schema.session_variables where variable_name like '%aria_pagecache_division_limit';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_PAGECACHE_DIVISION_LIMIT	100
-MARIA_PAGECACHE_DIVISION_LIMIT	100
-set global maria_pagecache_division_limit=20;
-select @@global.maria_pagecache_division_limit, @@global.aria_pagecache_division_limit;
-@@global.maria_pagecache_division_limit	@@global.aria_pagecache_division_limit
-20	20
-set session maria_pagecache_division_limit=1;
-ERROR HY000: Variable 'maria_pagecache_division_limit' is a GLOBAL variable and should be set with SET GLOBAL
-set global maria_pagecache_division_limit=1.1;
-ERROR 42000: Incorrect argument type to variable 'maria_pagecache_division_limit'
-set global maria_pagecache_division_limit=1e1;
-ERROR 42000: Incorrect argument type to variable 'maria_pagecache_division_limit'
-set global maria_pagecache_division_limit="foo";
-ERROR 42000: Incorrect argument type to variable 'maria_pagecache_division_limit'
-set global maria_pagecache_division_limit=0;
-Warnings:
-Warning	1292	Truncated incorrect aria_pagecache_division_limit value: '0'
-select @@global.maria_pagecache_division_limit, @@global.aria_pagecache_division_limit;
-@@global.maria_pagecache_division_limit	@@global.aria_pagecache_division_limit
-1	1
-set global maria_pagecache_division_limit=cast(-1 as unsigned int);
-Warnings:
-Warning	1292	Truncated incorrect aria_pagecache_division_limit value: '18446744073709551615'
-select @@global.maria_pagecache_division_limit, @@global.aria_pagecache_division_limit;
-@@global.maria_pagecache_division_limit	@@global.aria_pagecache_division_limit
-100	100
-SET @@global.maria_pagecache_division_limit = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/maria_recover_basic.result b/mysql-test/suite/sys_vars/r/maria_recover_basic.result
deleted file mode 100644
index 53a215d69c3..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_recover_basic.result
+++ /dev/null
@@ -1,57 +0,0 @@
-SET @start_global_value = @@global.maria_recover;
-select @@global.maria_recover, @@global.aria_recover;
-@@global.maria_recover	@@global.aria_recover
-NORMAL	NORMAL
-select @@session.maria_recover, @@session.aria_recover;
-ERROR HY000: Variable 'maria_recover' is a GLOBAL variable
-show global variables like '%aria_recover';
-Variable_name	Value
-aria_recover	NORMAL
-maria_recover	NORMAL
-show session variables like '%aria_recover';
-Variable_name	Value
-aria_recover	NORMAL
-maria_recover	NORMAL
-select * from information_schema.global_variables where variable_name like '%aria_recover';
-VARIABLE_NAME	VARIABLE_VALUE
-MARIA_RECOVER	NORMAL
-ARIA_RECOVER	NORMAL
-select * from information_schema.session_variables where variable_name like '%aria_recover';
-VARIABLE_NAME	VARIABLE_VALUE
-MARIA_RECOVER	NORMAL
-ARIA_RECOVER	NORMAL
-set global maria_recover=1;
-select @@global.maria_recover, @@global.aria_recover;
-@@global.maria_recover	@@global.aria_recover
-NORMAL	NORMAL
-set session maria_recover=1;
-ERROR HY000: Variable 'maria_recover' is a GLOBAL variable and should be set with SET GLOBAL
-set global maria_recover=normal;
-select @@global.maria_recover, @@global.aria_recover;
-@@global.maria_recover	@@global.aria_recover
-NORMAL	NORMAL
-set global maria_recover=backup;
-select @@global.maria_recover, @@global.aria_recover;
-@@global.maria_recover	@@global.aria_recover
-BACKUP	BACKUP
-set global maria_recover='force';
-select @@global.maria_recover, @@global.aria_recover;
-@@global.maria_recover	@@global.aria_recover
-FORCE	FORCE
-set global maria_recover=`quick`;
-select @@global.maria_recover, @@global.aria_recover;
-@@global.maria_recover	@@global.aria_recover
-QUICK	QUICK
-set global maria_recover=off;
-select @@global.maria_recover, @@global.aria_recover;
-@@global.maria_recover	@@global.aria_recover
-OFF	OFF
-set global maria_recover=1.1;
-ERROR 42000: Incorrect argument type to variable 'maria_recover'
-set global maria_recover=1e1;
-ERROR 42000: Incorrect argument type to variable 'maria_recover'
-set global maria_recover="foo";
-ERROR 42000: Variable 'maria_recover' can't be set to the value of 'foo'
-set global maria_recover=5;
-ERROR 42000: Variable 'maria_recover' can't be set to the value of '5'
-SET @@global.maria_recover = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/maria_repair_threads_basic.result b/mysql-test/suite/sys_vars/r/maria_repair_threads_basic.result
deleted file mode 100644
index 0e0610953c9..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_repair_threads_basic.result
+++ /dev/null
@@ -1,48 +0,0 @@
-SET @start_global_value = @@global.maria_repair_threads;
-select @@global.maria_repair_threads, @@global.aria_repair_threads;
-@@global.maria_repair_threads	@@global.aria_repair_threads
-1	1
-select @@session.maria_repair_threads, @@session.aria_repair_threads;
-@@session.maria_repair_threads	@@session.aria_repair_threads
-1	1
-show global variables like '%aria_repair_threads';
-Variable_name	Value
-aria_repair_threads	1
-maria_repair_threads	1
-show session variables like '%aria_repair_threads';
-Variable_name	Value
-aria_repair_threads	1
-maria_repair_threads	1
-select * from information_schema.global_variables where variable_name like '%aria_repair_threads';
-VARIABLE_NAME	VARIABLE_VALUE
-MARIA_REPAIR_THREADS	1
-ARIA_REPAIR_THREADS	1
-select * from information_schema.session_variables where variable_name like '%aria_repair_threads';
-VARIABLE_NAME	VARIABLE_VALUE
-MARIA_REPAIR_THREADS	1
-ARIA_REPAIR_THREADS	1
-set global maria_repair_threads=10;
-select @@global.maria_repair_threads, @@global.aria_repair_threads;
-@@global.maria_repair_threads	@@global.aria_repair_threads
-10	10
-set session maria_repair_threads=10;
-select @@session.maria_repair_threads, @@session.aria_repair_threads;
-@@session.maria_repair_threads	@@session.aria_repair_threads
-10	10
-set global maria_repair_threads=1.1;
-ERROR 42000: Incorrect argument type to variable 'maria_repair_threads'
-set session maria_repair_threads=1e1;
-ERROR 42000: Incorrect argument type to variable 'maria_repair_threads'
-set global maria_repair_threads="foo";
-ERROR 42000: Incorrect argument type to variable 'maria_repair_threads'
-set global maria_repair_threads=0;
-Warnings:
-Warning	1292	Truncated incorrect aria_repair_threads value: '0'
-select @@global.maria_repair_threads, @@global.aria_repair_threads;
-@@global.maria_repair_threads	@@global.aria_repair_threads
-1	1
-set session maria_repair_threads=cast(-1 as unsigned int);
-select @@session.maria_repair_threads, @@session.aria_repair_threads;
-@@session.maria_repair_threads	@@session.aria_repair_threads
-18446744073709551615	18446744073709551615
-SET @@global.maria_repair_threads = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/maria_sort_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/maria_sort_buffer_size_basic.result
deleted file mode 100644
index 42ddaa05c16..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_sort_buffer_size_basic.result
+++ /dev/null
@@ -1,48 +0,0 @@
-SET @start_global_value = @@global.maria_sort_buffer_size;
-select @@global.maria_sort_buffer_size, @@global.aria_sort_buffer_size;
-@@global.maria_sort_buffer_size	@@global.aria_sort_buffer_size
-134217728	134217728
-select @@session.maria_sort_buffer_size, @@session.aria_sort_buffer_size;
-@@session.maria_sort_buffer_size	@@session.aria_sort_buffer_size
-134217728	134217728
-show global variables like '%aria_sort_buffer_size';
-Variable_name	Value
-aria_sort_buffer_size	134217728
-maria_sort_buffer_size	134217728
-show session variables like '%aria_sort_buffer_size';
-Variable_name	Value
-aria_sort_buffer_size	134217728
-maria_sort_buffer_size	134217728
-select * from information_schema.global_variables where variable_name like '%aria_sort_buffer_size';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_SORT_BUFFER_SIZE	134217728
-MARIA_SORT_BUFFER_SIZE	134217728
-select * from information_schema.session_variables where variable_name like '%aria_sort_buffer_size';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_SORT_BUFFER_SIZE	134217728
-MARIA_SORT_BUFFER_SIZE	134217728
-set global maria_sort_buffer_size=10;
-select @@global.maria_sort_buffer_size, @@global.aria_sort_buffer_size;
-@@global.maria_sort_buffer_size	@@global.aria_sort_buffer_size
-10	10
-set session maria_sort_buffer_size=10;
-select @@session.maria_sort_buffer_size, @@session.aria_sort_buffer_size;
-@@session.maria_sort_buffer_size	@@session.aria_sort_buffer_size
-10	10
-set global maria_sort_buffer_size=1.1;
-ERROR 42000: Incorrect argument type to variable 'maria_sort_buffer_size'
-set session maria_sort_buffer_size=1e1;
-ERROR 42000: Incorrect argument type to variable 'maria_sort_buffer_size'
-set global maria_sort_buffer_size="foo";
-ERROR 42000: Incorrect argument type to variable 'maria_sort_buffer_size'
-set global maria_sort_buffer_size=0;
-Warnings:
-Warning	1292	Truncated incorrect aria_sort_buffer_size value: '0'
-select @@global.maria_sort_buffer_size, @@global.aria_sort_buffer_size;
-@@global.maria_sort_buffer_size	@@global.aria_sort_buffer_size
-4	4
-set session maria_sort_buffer_size=cast(-1 as unsigned int);
-select @@session.maria_sort_buffer_size, @@session.aria_sort_buffer_size;
-@@session.maria_sort_buffer_size	@@session.aria_sort_buffer_size
-18446744073709551615	18446744073709551615
-SET @@global.maria_sort_buffer_size = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/maria_stats_method_basic.result b/mysql-test/suite/sys_vars/r/maria_stats_method_basic.result
deleted file mode 100644
index 7b3b2015db3..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_stats_method_basic.result
+++ /dev/null
@@ -1,52 +0,0 @@
-SET @start_global_value = @@global.maria_stats_method;
-select @@global.maria_stats_method, @@global.aria_stats_method;
-@@global.maria_stats_method	@@global.aria_stats_method
-nulls_unequal	nulls_unequal
-select @@session.maria_stats_method, @@session.aria_stats_method;
-@@session.maria_stats_method	@@session.aria_stats_method
-nulls_unequal	nulls_unequal
-show global variables like '%aria_stats_method';
-Variable_name	Value
-aria_stats_method	nulls_unequal
-maria_stats_method	nulls_unequal
-show session variables like '%aria_stats_method';
-Variable_name	Value
-aria_stats_method	nulls_unequal
-maria_stats_method	nulls_unequal
-select * from information_schema.global_variables where variable_name like '%aria_stats_method';
-VARIABLE_NAME	VARIABLE_VALUE
-MARIA_STATS_METHOD	nulls_unequal
-ARIA_STATS_METHOD	nulls_unequal
-select * from information_schema.session_variables where variable_name like '%aria_stats_method';
-VARIABLE_NAME	VARIABLE_VALUE
-MARIA_STATS_METHOD	nulls_unequal
-ARIA_STATS_METHOD	nulls_unequal
-set global maria_stats_method=1;
-select @@global.maria_stats_method, @@global.aria_stats_method;
-@@global.maria_stats_method	@@global.aria_stats_method
-nulls_equal	nulls_equal
-set session maria_stats_method=1;
-select @@session.maria_stats_method, @@session.aria_stats_method;
-@@session.maria_stats_method	@@session.aria_stats_method
-nulls_equal	nulls_equal
-set session maria_stats_method=nulls_unequal;
-select @@session.maria_stats_method, @@session.aria_stats_method;
-@@session.maria_stats_method	@@session.aria_stats_method
-nulls_unequal	nulls_unequal
-set session maria_stats_method=nulls_equal;
-select @@session.maria_stats_method, @@session.aria_stats_method;
-@@session.maria_stats_method	@@session.aria_stats_method
-nulls_equal	nulls_equal
-set session maria_stats_method=nulls_ignored;
-select @@session.maria_stats_method, @@session.aria_stats_method;
-@@session.maria_stats_method	@@session.aria_stats_method
-nulls_ignored	nulls_ignored
-set session maria_stats_method=1.1;
-ERROR 42000: Incorrect argument type to variable 'maria_stats_method'
-set session maria_stats_method=1e1;
-ERROR 42000: Incorrect argument type to variable 'maria_stats_method'
-set session maria_stats_method="foo";
-ERROR 42000: Variable 'maria_stats_method' can't be set to the value of 'foo'
-set session maria_stats_method=3;
-ERROR 42000: Variable 'maria_stats_method' can't be set to the value of '3'
-SET @@global.maria_stats_method = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/maria_sync_log_dir_basic.result b/mysql-test/suite/sys_vars/r/maria_sync_log_dir_basic.result
deleted file mode 100644
index 456a0ddb970..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_sync_log_dir_basic.result
+++ /dev/null
@@ -1,49 +0,0 @@
-SET @start_global_value = @@global.maria_sync_log_dir;
-select @@global.maria_sync_log_dir, @@global.aria_sync_log_dir;
-@@global.maria_sync_log_dir	@@global.aria_sync_log_dir
-NEWFILE	NEWFILE
-select @@session.maria_sync_log_dir, @@session.aria_sync_log_dir;
-ERROR HY000: Variable 'maria_sync_log_dir' is a GLOBAL variable
-show global variables like '%aria_sync_log_dir';
-Variable_name	Value
-aria_sync_log_dir	NEWFILE
-maria_sync_log_dir	NEWFILE
-show session variables like '%aria_sync_log_dir';
-Variable_name	Value
-aria_sync_log_dir	NEWFILE
-maria_sync_log_dir	NEWFILE
-select * from information_schema.global_variables where variable_name like '%aria_sync_log_dir';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_SYNC_LOG_DIR	NEWFILE
-MARIA_SYNC_LOG_DIR	NEWFILE
-select * from information_schema.session_variables where variable_name like '%aria_sync_log_dir';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_SYNC_LOG_DIR	NEWFILE
-MARIA_SYNC_LOG_DIR	NEWFILE
-set global maria_sync_log_dir=1;
-select @@global.maria_sync_log_dir, @@global.aria_sync_log_dir;
-@@global.maria_sync_log_dir	@@global.aria_sync_log_dir
-NEWFILE	NEWFILE
-set session maria_sync_log_dir=1;
-ERROR HY000: Variable 'maria_sync_log_dir' is a GLOBAL variable and should be set with SET GLOBAL
-set global maria_sync_log_dir=never;
-select @@global.maria_sync_log_dir, @@global.aria_sync_log_dir;
-@@global.maria_sync_log_dir	@@global.aria_sync_log_dir
-NEVER	NEVER
-set global maria_sync_log_dir=newfile;
-select @@global.maria_sync_log_dir, @@global.aria_sync_log_dir;
-@@global.maria_sync_log_dir	@@global.aria_sync_log_dir
-NEWFILE	NEWFILE
-set global maria_sync_log_dir=always;
-select @@global.maria_sync_log_dir, @@global.aria_sync_log_dir;
-@@global.maria_sync_log_dir	@@global.aria_sync_log_dir
-ALWAYS	ALWAYS
-set global maria_sync_log_dir=1.1;
-ERROR 42000: Incorrect argument type to variable 'maria_sync_log_dir'
-set global maria_sync_log_dir=1e1;
-ERROR 42000: Incorrect argument type to variable 'maria_sync_log_dir'
-set global maria_sync_log_dir="foo";
-ERROR 42000: Variable 'maria_sync_log_dir' can't be set to the value of 'foo'
-set global maria_sync_log_dir=3;
-ERROR 42000: Variable 'maria_sync_log_dir' can't be set to the value of '3'
-SET @@global.maria_sync_log_dir = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/maria_used_for_temp_tables_basic.result b/mysql-test/suite/sys_vars/r/maria_used_for_temp_tables_basic.result
deleted file mode 100644
index 8795e0f128b..00000000000
--- a/mysql-test/suite/sys_vars/r/maria_used_for_temp_tables_basic.result
+++ /dev/null
@@ -1,25 +0,0 @@
-select @@global.maria_used_for_temp_tables, @@global.aria_used_for_temp_tables;
-@@global.maria_used_for_temp_tables	@@global.aria_used_for_temp_tables
-1	1
-select @@session.maria_used_for_temp_tables, @@session.aria_used_for_temp_tables;
-ERROR HY000: Variable 'maria_used_for_temp_tables' is a GLOBAL variable
-show global variables like '%aria_used_for_temp_tables';
-Variable_name	Value
-aria_used_for_temp_tables	ON
-maria_used_for_temp_tables	ON
-show session variables like '%aria_used_for_temp_tables';
-Variable_name	Value
-aria_used_for_temp_tables	ON
-maria_used_for_temp_tables	ON
-select * from information_schema.global_variables where variable_name like '%aria_used_for_temp_tables';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_USED_FOR_TEMP_TABLES	ON
-MARIA_USED_FOR_TEMP_TABLES	ON
-select * from information_schema.session_variables where variable_name like '%aria_used_for_temp_tables';
-VARIABLE_NAME	VARIABLE_VALUE
-ARIA_USED_FOR_TEMP_TABLES	ON
-MARIA_USED_FOR_TEMP_TABLES	ON
-set global maria_used_for_temp_tables=1;
-ERROR HY000: Variable 'maria_used_for_temp_tables' is a read only variable
-set session maria_used_for_temp_tables=1;
-ERROR HY000: Variable 'maria_used_for_temp_tables' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/master_verify_checksum_basic.result b/mysql-test/suite/sys_vars/r/master_verify_checksum_basic.result
new file mode 100644
index 00000000000..83a1283c358
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/master_verify_checksum_basic.result
@@ -0,0 +1,11 @@
+set @save_master_verify_checksum =  @@global.master_verify_checksum;
+select @@global.master_verify_checksum  as 'must be zero because of default';
+must be zero because of default
+0
+select @@session.master_verify_checksum  as 'no session var';
+ERROR HY000: Variable 'master_verify_checksum' is a GLOBAL variable
+set @@global.master_verify_checksum = 0;
+set @@global.master_verify_checksum = default;
+set @@global.master_verify_checksum = 2;
+ERROR 42000: Variable 'master_verify_checksum' can't be set to the value of '2'
+set @@global.master_verify_checksum = @save_master_verify_checksum;
diff --git a/mysql-test/suite/sys_vars/r/max_join_size_basic.result b/mysql-test/suite/sys_vars/r/max_join_size_basic.result
index acf9f123238..1f64514130c 100644
--- a/mysql-test/suite/sys_vars/r/max_join_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_join_size_basic.result
@@ -50,6 +50,8 @@ select @@sql_big_selects;
 @@sql_big_selects
 0
 set max_join_size=cast(-1 as unsigned int);
+Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 select @@sql_big_selects;
 @@sql_big_selects
 1
diff --git a/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result b/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result
index 5a2441276ec..7b56de4857e 100644
--- a/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result
+++ b/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result
@@ -29,7 +29,7 @@ INSERT INTO t1(b) VALUES("CRec");
 EXPLAIN SELECT STRAIGHT_JOIN * FROM t1,t1 AS t2 WHERE t1.b = t2.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	3	Using where; Using join buffer
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	3	Using where; Using join buffer (flat, BNL join)
 '#--------------------FN_DYNVARS_084_02-------------------------#'
 SELECT @@global.max_seeks_for_key = 10;
 @@global.max_seeks_for_key = 10
@@ -45,7 +45,7 @@ INSERT INTO t1(b) VALUES("AREc");
 EXPLAIN SELECT STRAIGHT_JOIN * FROM t1,t1 AS t2 WHERE t1.b = t2.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	Using where; Using join buffer
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	Using where; Using join buffer (flat, BNL join)
 SET @@session.max_seeks_for_key = 2;
 SELECT @@session.max_seeks_for_key;
 @@session.max_seeks_for_key
@@ -55,7 +55,7 @@ INSERT INTO t1(b) VALUES("CRec");
 EXPLAIN SELECT STRAIGHT_JOIN * FROM t1,t1 AS t2 WHERE t1.b = t2.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	6	
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	6	Using where; Using join buffer
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	6	Using where; Using join buffer (flat, BNL join)
 INSERT INTO t1 VALUES(null,"test");
 INSERT INTO t1 VALUES (null,"a"),(null,"a"),(null,"a"),
 (null,"a"),(null,"a"),(null,"a"),(null,"a"),
@@ -63,7 +63,7 @@ INSERT INTO t1 VALUES (null,"a"),(null,"a"),(null,"a"),
 EXPLAIN SELECT STRAIGHT_JOIN * FROM t1,t1 AS t2 WHERE t1.b = t2.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	17	
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	17	Using where; Using join buffer
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	17	Using where; Using join buffer (flat, BNL join)
 ANALYZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
@@ -71,7 +71,7 @@ SET MAX_SEEKS_FOR_KEY=1;
 EXPLAIN SELECT STRAIGHT_JOIN * FROM t1,t1 AS t2 WHERE t1.b = t2.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	17	
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	17	Using where; Using join buffer
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	17	Using where; Using join buffer (flat, BNL join)
 SET MAX_SEEKS_FOR_KEY=DEFAULT;
 DROP TABLE t1;
 SET @@global.max_seeks_for_key= @start_value;
diff --git a/mysql-test/suite/sys_vars/r/mrr_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/mrr_buffer_size_basic.result
index 9c358de69a5..ace7a44977e 100644
--- a/mysql-test/suite/sys_vars/r/mrr_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/mrr_buffer_size_basic.result
@@ -43,6 +43,7 @@ select @@global.mrr_buffer_size;
 8192
 set session mrr_buffer_size=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect mrr_buffer_size value: '18446744073709551615'
 select @@session.mrr_buffer_size;
 @@session.mrr_buffer_size
diff --git a/mysql-test/suite/sys_vars/r/new_basic.result b/mysql-test/suite/sys_vars/r/new_basic.result
deleted file mode 100644
index c1f11e20cca..00000000000
--- a/mysql-test/suite/sys_vars/r/new_basic.result
+++ /dev/null
@@ -1,160 +0,0 @@
-SET @start_global_value = @@global.new;
-SELECT @start_global_value;
-@start_global_value
-0
-SET @start_session_value = @@session.new;
-SELECT @start_session_value;
-@start_session_value
-0
-'#--------------------FN_DYNVARS_113_01-------------------------#'
-SET @@global.new = ON;
-SET @@global.new = DEFAULT;
-SELECT @@global.new;
-@@global.new
-0
-SET @@session.new = ON;
-SET @@session.new = DEFAULT;
-SELECT @@session.new;
-@@session.new
-0
-'#--------------------FN_DYNVARS_113_02-------------------------#'
-SET @@global.new = DEFAULT;
-SELECT @@global.new = 'OFF';
-@@global.new = 'OFF'
-1
-Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'OFF'
-SET @@session.new = DEFAULT;
-SELECT @@session.new = 'OFF';
-@@session.new = 'OFF'
-1
-Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'OFF'
-'#--------------------FN_DYNVARS_113_03-------------------------#'
-SET @@global.new = ON;
-SELECT @@global.new;
-@@global.new
-1
-SET @@global.new = OFF;
-SELECT @@global.new;
-@@global.new
-0
-SET @@global.new = 0;
-SELECT @@global.new;
-@@global.new
-0
-SET @@global.new = 1;
-SELECT @@global.new;
-@@global.new
-1
-SET @@global.new = TRUE;
-SELECT @@global.new;
-@@global.new
-1
-SET @@global.new = FALSE;
-SELECT @@global.new;
-@@global.new
-0
-'#--------------------FN_DYNVARS_113_04-------------------------#'
-SET @@session.new = ON;
-SELECT @@session.new;
-@@session.new
-1
-SET @@session.new = OFF;
-SELECT @@session.new;
-@@session.new
-0
-SET @@session.new = 0;
-SELECT @@session.new;
-@@session.new
-0
-SET @@session.new = 1;
-SELECT @@session.new;
-@@session.new
-1
-SET @@session.new = TRUE;
-SELECT @@session.new;
-@@session.new
-1
-SET @@session.new = FALSE;
-SELECT @@session.new;
-@@session.new
-0
-'#------------------FN_DYNVARS_113_05-----------------------#'
-SET @@global.new = 'ONN';
-ERROR 42000: Variable 'new' can't be set to the value of 'ONN'
-SET @@global.new = "OFFF";
-ERROR 42000: Variable 'new' can't be set to the value of 'OFFF'
-SET @@global.new = TTRUE;
-ERROR 42000: Variable 'new' can't be set to the value of 'TTRUE'
-SET @@global.new = FELSE;
-ERROR 42000: Variable 'new' can't be set to the value of 'FELSE'
-SET @@global.new = -1024;
-ERROR 42000: Variable 'new' can't be set to the value of '-1024'
-SET @@global.new = 65536;
-ERROR 42000: Variable 'new' can't be set to the value of '65536'
-SET @@global.new = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'new'
-SET @@global.new = test;
-ERROR 42000: Variable 'new' can't be set to the value of 'test'
-SET @@session.new = ONN;
-ERROR 42000: Variable 'new' can't be set to the value of 'ONN'
-SET @@session.new = ONF;
-ERROR 42000: Variable 'new' can't be set to the value of 'ONF'
-SET @@session.new = OF;
-ERROR 42000: Variable 'new' can't be set to the value of 'OF'
-SET @@session.new = 'OFN';
-ERROR 42000: Variable 'new' can't be set to the value of 'OFN'
-SET @@session.new = -2;
-ERROR 42000: Variable 'new' can't be set to the value of '-2'
-SET @@session.new = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'new'
-SET @@session.new = 65550;
-ERROR 42000: Variable 'new' can't be set to the value of '65550'
-SET @@session.new = test;
-ERROR 42000: Variable 'new' can't be set to the value of 'test'
-'#------------------FN_DYNVARS_113_06-----------------------#'
-SELECT IF(@@global.new, "ON", "OFF") = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='new';
-IF(@@global.new, "ON", "OFF") = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_113_07-----------------------#'
-SELECT IF(@@session.new, "ON", "OFF") = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='new';
-IF(@@session.new, "ON", "OFF") = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_113_08----------------------#'
-SET @@new = OFF;
-SET @@global.new = ON;
-SELECT @@new = @@global.new;
-@@new = @@global.new
-0
-'#---------------------FN_DYNVARS_113_09----------------------#'
-SET @@new = ON;
-SELECT @@new = @@local.new;
-@@new = @@local.new
-1
-SELECT @@local.new = @@session.new;
-@@local.new = @@session.new
-1
-'#---------------------FN_DYNVARS_113_10----------------------#'
-SET new = 1;
-SELECT @@new;
-@@new
-1
-SELECT local.new;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.new;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT new = @@session.new;
-ERROR 42S22: Unknown column 'new' in 'field list'
-SET @@global.new = @start_global_value;
-SELECT @@global.new;
-@@global.new
-0
-SET @@session.new = @start_session_value;
-SELECT @@session.new;
-@@session.new
-0
diff --git a/mysql-test/suite/sys_vars/r/old_basic.result b/mysql-test/suite/sys_vars/r/old_basic.result
index 03bf61257c1..bafe7128821 100644
--- a/mysql-test/suite/sys_vars/r/old_basic.result
+++ b/mysql-test/suite/sys_vars/r/old_basic.result
@@ -2,7 +2,8 @@ select @@global.old;
 @@global.old
 0
 select @@session.old;
-ERROR HY000: Variable 'old' is a GLOBAL variable
+@@session.old
+0
 show global variables like 'old';
 Variable_name	Value
 old	OFF
@@ -16,6 +17,11 @@ select * from information_schema.session_variables where variable_name='old';
 VARIABLE_NAME	VARIABLE_VALUE
 OLD	OFF
 set global old=1;
-ERROR HY000: Variable 'old' is a read only variable
 set session old=1;
-ERROR HY000: Variable 'old' is a read only variable
+select @@global.old;
+@@global.old
+1
+select @@session.old;
+@@session.old
+1
+set @@global.old=DEFAULT;
diff --git a/mysql-test/suite/sys_vars/r/optimizer_switch_basic.result b/mysql-test/suite/sys_vars/r/optimizer_switch_basic.result
index 4ed63abbc3d..a56bcc77886 100644
--- a/mysql-test/suite/sys_vars/r/optimizer_switch_basic.result
+++ b/mysql-test/suite/sys_vars/r/optimizer_switch_basic.result
@@ -1,57 +1,57 @@
 SET @start_global_value = @@global.optimizer_switch;
 SELECT @start_global_value;
 @start_global_value
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 select @@global.optimizer_switch;
 @@global.optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 select @@session.optimizer_switch;
 @@session.optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 show global variables like 'optimizer_switch';
 Variable_name	Value
-optimizer_switch	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+optimizer_switch	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 show session variables like 'optimizer_switch';
 Variable_name	Value
-optimizer_switch	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+optimizer_switch	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 select * from information_schema.global_variables where variable_name='optimizer_switch';
 VARIABLE_NAME	VARIABLE_VALUE
-OPTIMIZER_SWITCH	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+OPTIMIZER_SWITCH	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 select * from information_schema.session_variables where variable_name='optimizer_switch';
 VARIABLE_NAME	VARIABLE_VALUE
-OPTIMIZER_SWITCH	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+OPTIMIZER_SWITCH	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
 set global optimizer_switch=10;
 set session optimizer_switch=5;
 select @@global.optimizer_switch;
 @@global.optimizer_switch
-index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,table_elimination=off
+index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off
 select @@session.optimizer_switch;
 @@session.optimizer_switch
-index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,table_elimination=off
+index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off
 set global optimizer_switch="index_merge_sort_union=on";
 set session optimizer_switch="index_merge=off";
 select @@global.optimizer_switch;
 @@global.optimizer_switch
-index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,table_elimination=off
+index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off
 select @@session.optimizer_switch;
 @@session.optimizer_switch
-index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,table_elimination=off
+index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off
 show global variables like 'optimizer_switch';
 Variable_name	Value
-optimizer_switch	index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,table_elimination=off
+optimizer_switch	index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off
 show session variables like 'optimizer_switch';
 Variable_name	Value
-optimizer_switch	index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,table_elimination=off
+optimizer_switch	index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off
 select * from information_schema.global_variables where variable_name='optimizer_switch';
 VARIABLE_NAME	VARIABLE_VALUE
-OPTIMIZER_SWITCH	index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,table_elimination=off
+OPTIMIZER_SWITCH	index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off
 select * from information_schema.session_variables where variable_name='optimizer_switch';
 VARIABLE_NAME	VARIABLE_VALUE
-OPTIMIZER_SWITCH	index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,table_elimination=off
+OPTIMIZER_SWITCH	index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off
 set session optimizer_switch="default";
 select @@session.optimizer_switch;
 @@session.optimizer_switch
-index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,table_elimination=off
+index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off
 set global optimizer_switch=1.1;
 ERROR 42000: Incorrect argument type to variable 'optimizer_switch'
 set global optimizer_switch=1e1;
@@ -60,14 +60,7 @@ set session optimizer_switch="index_merge";
 ERROR 42000: Variable 'optimizer_switch' can't be set to the value of 'index_merge'
 set session optimizer_switch="foobar";
 ERROR 42000: Variable 'optimizer_switch' can't be set to the value of 'foobar'
-#
-# Bug#59894 set optimizer_switch to e or d causes invalid
-# memory writes/valgrind warnings
-
-set global optimizer_switch = 'd';
-set global optimizer_switch = 'e';
-ERROR 42000: Variable 'optimizer_switch' can't be set to the value of 'e'
 SET @@global.optimizer_switch = @start_global_value;
 SELECT @@global.optimizer_switch;
 @@global.optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,table_elimination=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
diff --git a/mysql-test/suite/sys_vars/r/optimizer_use_mrr_basic.result b/mysql-test/suite/sys_vars/r/optimizer_use_mrr_basic.result
deleted file mode 100644
index 45a7d83c2ad..00000000000
--- a/mysql-test/suite/sys_vars/r/optimizer_use_mrr_basic.result
+++ /dev/null
@@ -1,48 +0,0 @@
-SET @start_global_value = @@global.optimizer_use_mrr;
-select @@global.optimizer_use_mrr;
-@@global.optimizer_use_mrr
-force
-select @@session.optimizer_use_mrr;
-@@session.optimizer_use_mrr
-force
-show global variables like 'optimizer_use_mrr';
-Variable_name	Value
-optimizer_use_mrr	force
-show session variables like 'optimizer_use_mrr';
-Variable_name	Value
-optimizer_use_mrr	force
-select * from information_schema.global_variables where variable_name='optimizer_use_mrr';
-VARIABLE_NAME	VARIABLE_VALUE
-OPTIMIZER_USE_MRR	force
-select * from information_schema.session_variables where variable_name='optimizer_use_mrr';
-VARIABLE_NAME	VARIABLE_VALUE
-OPTIMIZER_USE_MRR	force
-set global optimizer_use_mrr=1;
-select @@global.optimizer_use_mrr;
-@@global.optimizer_use_mrr
-force
-set session optimizer_use_mrr=1;
-select @@session.optimizer_use_mrr;
-@@session.optimizer_use_mrr
-force
-set session optimizer_use_mrr='auto';
-select @@session.optimizer_use_mrr;
-@@session.optimizer_use_mrr
-auto
-set session optimizer_use_mrr='force';
-select @@session.optimizer_use_mrr;
-@@session.optimizer_use_mrr
-force
-set session optimizer_use_mrr='disable';
-select @@session.optimizer_use_mrr;
-@@session.optimizer_use_mrr
-disable
-set session optimizer_use_mrr=1.1;
-ERROR 42000: Incorrect argument type to variable 'optimizer_use_mrr'
-set session optimizer_use_mrr=1e1;
-ERROR 42000: Incorrect argument type to variable 'optimizer_use_mrr'
-set session optimizer_use_mrr="foo";
-ERROR 42000: Variable 'optimizer_use_mrr' can't be set to the value of 'foo'
-set session optimizer_use_mrr=3;
-ERROR 42000: Variable 'optimizer_use_mrr' can't be set to the value of '3'
-SET @@global.optimizer_use_mrr = @start_global_value;
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 c6d7999677f..c858adf9bcf 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,6 +1,8 @@
 SET @start_value = @@global.query_cache_size;
 '#--------------------FN_DYNVARS_133_01------------------------#'
 SET @@global.query_cache_size = 99;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '99'
 SET @@global.query_cache_size = DEFAULT;
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
@@ -16,10 +18,14 @@ SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
 SET @@global.query_cache_size = 1;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '1'
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
 SET @@global.query_cache_size = 512;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '512'
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
@@ -29,13 +35,13 @@ Warning	1282	Query cache failed to set size 1024; new query cache size is 0
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
-: 'Bug#34880: Warnings are coming on assinging valid values to variable
-'Bug# 34877: Invalid Values are coming in variable on assigning valid values';
 SET @@global.query_cache_size = 1048576;
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 1048576
 SET @@global.query_cache_size = 1048575;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '1048575'
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 1047552
@@ -46,11 +52,9 @@ Warning	1292	Truncated incorrect query_cache_size value: '-1'
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
-SET @@global.query_cache_size = 4294967296;
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-4294967296
 SET @@global.query_cache_size = 511;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '511'
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
@@ -65,13 +69,6 @@ Warning	1292	Truncated incorrect query_cache_size value: '-1024'
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
-SET @@global.query_cache_size = 42949672950;
-Warnings:
-Warning	1282	Query cache failed to set size 42949671936; new query cache size is 0
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
 SET @@global.query_cache_size = ON;
 ERROR 42000: Incorrect argument type to variable 'query_cache_size'
 SELECT @@global.query_cache_size;
@@ -101,6 +98,8 @@ WHERE VARIABLE_NAME='query_cache_size';
 1
 '#---------------------FN_DYNVARS_133_07----------------------#'
 SET @@global.query_cache_size = TRUE;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '1'
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
@@ -110,6 +109,8 @@ SELECT @@global.query_cache_size;
 0
 '#---------------------FN_DYNVARS_133_08----------------------#'
 SET @@global.query_cache_size = 1;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '1'
 SELECT @@query_cache_size = @@global.query_cache_size;
 @@query_cache_size = @@global.query_cache_size
 1
diff --git a/mysql-test/suite/sys_vars/r/query_cache_type_basic.result b/mysql-test/suite/sys_vars/r/query_cache_type_basic.result
index 2a5af454b90..bb49d671840 100644
--- a/mysql-test/suite/sys_vars/r/query_cache_type_basic.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_type_basic.result
@@ -103,11 +103,7 @@ SELECT @@global.query_cache_type;
 @@global.query_cache_type
 OFF
 '#---------------------FN_DYNVARS_134_09----------------------#'
-SET query_cache_type = 'ON';
-SET session.query_cache_type = 'OFF';
-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 'query_cache_type = 'OFF'' at line 1
-SET global.query_cache_type = 'DEMAND';
-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 'query_cache_type = 'DEMAND'' at line 1
+SET global query_cache_type = 'ON';
 SET session query_cache_type = 1;
 SELECT @@query_cache_type;
 @@query_cache_type
diff --git a/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result b/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result
index 6b90b61a035..c4342f3bca8 100644
--- a/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result
@@ -81,8 +81,8 @@ LOCK TABLE t1 WRITE;
 UNLOCK TABLES;
 SHOW STATUS LIKE 'Qcache_queries_in_cache';
 Variable_name	Value
-Qcache_queries_in_cache	1
-1 Expected
+Qcache_queries_in_cache	0
+0 Expected
 '#----------------------------FN_DYNVARS_136_04---------------------#'
 SELECT * FROM t1;
 id	value
diff --git a/mysql-test/suite/sys_vars/r/relay_log_basic.result b/mysql-test/suite/sys_vars/r/relay_log_basic.result
index 1b93db7442f..eca4f36c78d 100644
--- a/mysql-test/suite/sys_vars/r/relay_log_basic.result
+++ b/mysql-test/suite/sys_vars/r/relay_log_basic.result
@@ -1,20 +1,20 @@
 select @@global.relay_log;
 @@global.relay_log
-NULL
+mysqld-relay-bin
 select @@session.relay_log;
 ERROR HY000: Variable 'relay_log' is a GLOBAL variable
 show global variables like 'relay_log';
 Variable_name	Value
-relay_log	
+relay_log	mysqld-relay-bin
 show session variables like 'relay_log';
 Variable_name	Value
-relay_log	
+relay_log	mysqld-relay-bin
 select * from information_schema.global_variables where variable_name='relay_log';
 VARIABLE_NAME	VARIABLE_VALUE
-RELAY_LOG	
+RELAY_LOG	mysqld-relay-bin
 select * from information_schema.session_variables where variable_name='relay_log';
 VARIABLE_NAME	VARIABLE_VALUE
-RELAY_LOG	
+RELAY_LOG	mysqld-relay-bin
 set global relay_log=1;
 ERROR HY000: Variable 'relay_log' is a read only variable
 set session relay_log=1;
diff --git a/mysql-test/suite/sys_vars/r/relay_log_index_basic.result b/mysql-test/suite/sys_vars/r/relay_log_index_basic.result
index 56a3a34957c..d0ceddc96fe 100644
--- a/mysql-test/suite/sys_vars/r/relay_log_index_basic.result
+++ b/mysql-test/suite/sys_vars/r/relay_log_index_basic.result
@@ -1,20 +1,20 @@
 select @@global.relay_log_index;
 @@global.relay_log_index
-NULL
+mysqld-relay-bin.index
 select @@session.relay_log_index;
 ERROR HY000: Variable 'relay_log_index' is a GLOBAL variable
 show global variables like 'relay_log_index';
 Variable_name	Value
-relay_log_index	
+relay_log_index	mysqld-relay-bin.index
 show session variables like 'relay_log_index';
 Variable_name	Value
-relay_log_index	
+relay_log_index	mysqld-relay-bin.index
 select * from information_schema.global_variables where variable_name='relay_log_index';
 VARIABLE_NAME	VARIABLE_VALUE
-RELAY_LOG_INDEX	
+RELAY_LOG_INDEX	mysqld-relay-bin.index
 select * from information_schema.session_variables where variable_name='relay_log_index';
 VARIABLE_NAME	VARIABLE_VALUE
-RELAY_LOG_INDEX	
+RELAY_LOG_INDEX	mysqld-relay-bin.index
 set global relay_log_index=1;
 ERROR HY000: Variable 'relay_log_index' is a read only variable
 set session relay_log_index=1;
diff --git a/mysql-test/suite/sys_vars/r/rowid_merge_buff_size_basic.result b/mysql-test/suite/sys_vars/r/rowid_merge_buff_size_basic.result
index 222500dabda..6148f9e201b 100644
--- a/mysql-test/suite/sys_vars/r/rowid_merge_buff_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/rowid_merge_buff_size_basic.result
@@ -37,6 +37,7 @@ select @@global.rowid_merge_buff_size;
 0
 set session rowid_merge_buff_size=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect rowid_merge_buff_size value: '18446744073709551615'
 select @@session.rowid_merge_buff_size;
 @@session.rowid_merge_buff_size
diff --git a/mysql-test/suite/sys_vars/r/slave_sql_verify_checksum_basic.result b/mysql-test/suite/sys_vars/r/slave_sql_verify_checksum_basic.result
new file mode 100644
index 00000000000..cd80381239a
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/slave_sql_verify_checksum_basic.result
@@ -0,0 +1,11 @@
+set @save_slave_sql_verify_checksum = @@global.slave_sql_verify_checksum;
+select @@global.slave_sql_verify_checksum  as 'must be one because of default';
+must be one because of default
+1
+select @@session.slave_sql_verify_checksum  as 'no session var';
+ERROR HY000: Variable 'slave_sql_verify_checksum' is a GLOBAL variable
+set @@global.slave_sql_verify_checksum = 0;
+set @@global.slave_sql_verify_checksum = default;
+set @@global.slave_sql_verify_checksum = 2;
+ERROR 42000: Variable 'slave_sql_verify_checksum' can't be set to the value of '2'
+set @@global.slave_sql_verify_checksum = @save_slave_sql_verify_checksum;
diff --git a/mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result b/mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result
index e3c48725998..f74c0030465 100644
--- a/mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result
+++ b/mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result
@@ -1,10 +1,9 @@
 SET @start_value = @@global.slow_query_log_file;
 '#---------------------FN_DYNVARS_004_01-------------------------#'
 SET @@global.slow_query_log_file = DEFAULT;
-SET @a=concat(left(@@hostname, instr(concat(@@hostname, '.'), '.')-1), '-slow.log');
-SELECT RIGHT(@@global.slow_query_log_file, length(@a)) = @a;
-RIGHT(@@global.slow_query_log_file, length(@a)) = @a
-1
+SELECT @@global.slow_query_log_file;
+@@global.slow_query_log_file
+mysqld-slow.log
 '#--------------------FN_DYNVARS_004_02------------------------#'
 SET @@global.slow_query_log_file = mytest.log;
 SET @@global.slow_query_log_file = 12;
diff --git a/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
index 4fd96c154c3..b492a343a9b 100644
--- a/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
@@ -62,7 +62,7 @@ SELECT @@global.sort_buffer_size;
 SET @@global.sort_buffer_size = -1024;
 SELECT @@global.sort_buffer_size;
 @@global.sort_buffer_size
-32768
+1024
 SET @@global.sort_buffer_size = 4294967296;
 SELECT @@global.sort_buffer_size;
 @@global.sort_buffer_size
@@ -84,7 +84,7 @@ SELECT @@session.sort_buffer_size;
 SET @@session.sort_buffer_size = -2;
 SELECT @@session.sort_buffer_size;
 @@session.sort_buffer_size
-32768
+1024
 SET @@session.sort_buffer_size = 65530.34;
 ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
 SET @@session.sort_buffer_size = 4294967296;
@@ -107,11 +107,11 @@ INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
 SET @@global.sort_buffer_size = TRUE;
 SELECT @@global.sort_buffer_size;
 @@global.sort_buffer_size
-32768
+1024
 SET @@global.sort_buffer_size = FALSE;
 SELECT @@global.sort_buffer_size;
 @@global.sort_buffer_size
-32768
+1024
 '#---------------------FN_DYNVARS_151_09----------------------#'
 SET @@global.sort_buffer_size = 9000;
 SELECT @@sort_buffer_size = @@global.sort_buffer_size;
@@ -129,7 +129,7 @@ SELECT @@local.sort_buffer_size = @@session.sort_buffer_size;
 SET sort_buffer_size = 9100;
 SELECT @@sort_buffer_size;
 @@sort_buffer_size
-32768
+9100
 SELECT local.sort_buffer_size;
 ERROR 42S02: Unknown table 'local' in field list
 SELECT session.sort_buffer_size;
diff --git a/mysql-test/suite/sys_vars/r/sql_log_off_func.result b/mysql-test/suite/sys_vars/r/sql_log_off_func.result
index 51c37a16795..e51860534f1 100644
--- a/mysql-test/suite/sys_vars/r/sql_log_off_func.result
+++ b/mysql-test/suite/sys_vars/r/sql_log_off_func.result
@@ -19,6 +19,7 @@ UPDATE t1 SET a = 'aa1' WHERE a = 'aa1-updated';
 Checking if log contains the executed statement
 SELECT argument FROM mysql.general_log WHERE argument = 'UPDATE t1 SET a = \'aa1\' WHERE a = \'aa1-updated\'';
 argument
+UPDATE t1 SET a = 'aa1' WHERE a = 'aa1-updated'
 '#--------------------FN_DYNVARS_158_03--------------------------#'
 ** Connecting con_int1 using root **
 ** Connection con_int1 **
diff --git a/mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result b/mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result
index 7248b7a802f..3d898c82d23 100644
--- a/mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result
@@ -56,6 +56,7 @@ select @@sql_big_selects;
 set sql_max_join_size=cast(-1 as unsigned int);
 Warnings:
 Warning	1287	The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0. Please use '@@max_join_size' instead
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 select @@sql_big_selects;
 @@sql_big_selects
 1
diff --git a/mysql-test/suite/sys_vars/r/sync_master_info_basic.result b/mysql-test/suite/sys_vars/r/sync_master_info_basic.result
index 47aafe21a59..eda8282f8f5 100644
--- a/mysql-test/suite/sys_vars/r/sync_master_info_basic.result
+++ b/mysql-test/suite/sys_vars/r/sync_master_info_basic.result
@@ -37,6 +37,7 @@ select @@global.sync_master_info;
 0
 set global sync_master_info=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect sync_master_info value: '18446744073709551615'
 select @@global.sync_master_info;
 @@global.sync_master_info
diff --git a/mysql-test/suite/sys_vars/r/sync_relay_log_basic.result b/mysql-test/suite/sys_vars/r/sync_relay_log_basic.result
index 75eac82f11e..1f96b4fb698 100644
--- a/mysql-test/suite/sys_vars/r/sync_relay_log_basic.result
+++ b/mysql-test/suite/sys_vars/r/sync_relay_log_basic.result
@@ -37,6 +37,7 @@ select @@global.sync_relay_log;
 0
 set global sync_relay_log=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect sync_relay_log value: '18446744073709551615'
 select @@global.sync_relay_log;
 @@global.sync_relay_log
diff --git a/mysql-test/suite/sys_vars/r/sync_relay_log_info_basic.result b/mysql-test/suite/sys_vars/r/sync_relay_log_info_basic.result
index fe0efdc0737..5b4592db72f 100644
--- a/mysql-test/suite/sys_vars/r/sync_relay_log_info_basic.result
+++ b/mysql-test/suite/sys_vars/r/sync_relay_log_info_basic.result
@@ -37,6 +37,7 @@ select @@global.sync_relay_log_info;
 0
 set global sync_relay_log_info=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect sync_relay_log_info value: '18446744073709551615'
 select @@global.sync_relay_log_info;
 @@global.sync_relay_log_info
diff --git a/mysql-test/suite/sys_vars/r/thread_cache_size_basic.result b/mysql-test/suite/sys_vars/r/thread_cache_size_basic.result
index 83501ca929b..9db720a11a2 100644
--- a/mysql-test/suite/sys_vars/r/thread_cache_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/thread_cache_size_basic.result
@@ -43,6 +43,7 @@ select @@global.thread_cache_size;
 0
 set global thread_cache_size=cast(-1 as unsigned int);
 Warnings:
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect thread_cache_size value: '18446744073709551615'
 select @@global.thread_cache_size;
 @@global.thread_cache_size
diff --git a/mysql-test/suite/sys_vars/r/time_zone_func.result b/mysql-test/suite/sys_vars/r/time_zone_func.result
index 2153a3f58ff..684c1ec80f4 100644
--- a/mysql-test/suite/sys_vars/r/time_zone_func.result
+++ b/mysql-test/suite/sys_vars/r/time_zone_func.result
@@ -55,7 +55,7 @@ SET @@time_zone = 'MET';
 SELECT a,UNIX_TIMESTAMP(a) FROM t1;
 a	UNIX_TIMESTAMP(a)
 2008-03-05 16:28:00	1204730880
-1970-01-01 00:05:00	0
+1970-01-01 00:05:00	NULL
 1970-01-01 01:05:00	300
 SELECT a,UNIX_TIMESTAMP(a) FROM t2;
 a	UNIX_TIMESTAMP(a)
@@ -68,8 +68,8 @@ SET @@time_zone = '+05:00';
 SELECT a,UNIX_TIMESTAMP(a) FROM t1;
 a	UNIX_TIMESTAMP(a)
 2008-03-05 16:28:00	1204716480
-1970-01-01 00:05:00	0
-1970-01-01 01:05:00	0
+1970-01-01 00:05:00	NULL
+1970-01-01 01:05:00	NULL
 SELECT a,UNIX_TIMESTAMP(a) FROM t2;
 a	UNIX_TIMESTAMP(a)
 2008-03-05 21:28:00	1204734480
@@ -81,8 +81,8 @@ SET @@time_zone = '+06:00';
 SELECT a,UNIX_TIMESTAMP(a) FROM t1;
 a	UNIX_TIMESTAMP(a)
 2008-03-05 16:28:00	1204712880
-1970-01-01 00:05:00	0
-1970-01-01 01:05:00	0
+1970-01-01 00:05:00	NULL
+1970-01-01 01:05:00	NULL
 SELECT a,UNIX_TIMESTAMP(a) FROM t2;
 a	UNIX_TIMESTAMP(a)
 2008-03-05 22:28:00	1204734480
@@ -94,7 +94,7 @@ SET @@time_zone = '+01:00';
 SELECT a,UNIX_TIMESTAMP(a) FROM t1;
 a	UNIX_TIMESTAMP(a)
 2008-03-05 16:28:00	1204730880
-1970-01-01 00:05:00	0
+1970-01-01 00:05:00	NULL
 1970-01-01 01:05:00	300
 SELECT a,UNIX_TIMESTAMP(a) FROM t2;
 a	UNIX_TIMESTAMP(a)
@@ -107,8 +107,8 @@ SET @@time_zone = '+02:00';
 SELECT a,UNIX_TIMESTAMP(a) FROM t1;
 a	UNIX_TIMESTAMP(a)
 2008-03-05 16:28:00	1204727280
-1970-01-01 00:05:00	0
-1970-01-01 01:05:00	0
+1970-01-01 00:05:00	NULL
+1970-01-01 01:05:00	NULL
 SELECT a,UNIX_TIMESTAMP(a) FROM t2;
 a	UNIX_TIMESTAMP(a)
 2008-03-05 18:28:00	1204734480
@@ -133,8 +133,8 @@ SET @@time_zone = '+06:00';
 SELECT a,UNIX_TIMESTAMP(a) FROM t1;
 a	UNIX_TIMESTAMP(a)
 2008-03-05 16:28:00	1204712880
-1970-01-01 00:05:00	0
-1970-01-01 01:05:00	0
+1970-01-01 00:05:00	NULL
+1970-01-01 01:05:00	NULL
 SELECT a,UNIX_TIMESTAMP(a) FROM t2;
 a	UNIX_TIMESTAMP(a)
 2008-03-05 22:28:00	1204734480
diff --git a/mysql-test/suite/sys_vars/r/timestamp_basic.result b/mysql-test/suite/sys_vars/r/timestamp_basic.result
index a73de543815..ecc2340f298 100644
--- a/mysql-test/suite/sys_vars/r/timestamp_basic.result
+++ b/mysql-test/suite/sys_vars/r/timestamp_basic.result
@@ -1,37 +1,43 @@
 SET @session_start_value = @@session.timestamp;
 '#--------------------FN_DYNVARS_001_01------------------------#'
 SET @@timestamp = DEFAULT;
-SELECT @@timestamp = UNIX_TIMESTAMP();
-@@timestamp = UNIX_TIMESTAMP()
-1
+SELECT floor(@@timestamp) = UNIX_TIMESTAMP(), @@timestamp = UNIX_TIMESTAMP(NOW(6));
+floor(@@timestamp) = UNIX_TIMESTAMP()	@@timestamp = UNIX_TIMESTAMP(NOW(6))
+1	1
 '#---------------------FN_DYNVARS_001_02-------------------------#'
 SET @@global.timestamp = "1000";
 ERROR HY000: Variable 'timestamp' is a SESSION variable and can't be used with SET GLOBAL
 '#--------------------FN_DYNVARS_001_03------------------------#'
 SET @@timestamp = 0;
-SELECT @@timestamp = UNIX_TIMESTAMP();
-@@timestamp = UNIX_TIMESTAMP()
-1
+SELECT floor(@@timestamp) = UNIX_TIMESTAMP(), @@timestamp = UNIX_TIMESTAMP(NOW(6));
+floor(@@timestamp) = UNIX_TIMESTAMP()	@@timestamp = UNIX_TIMESTAMP(NOW(6))
+1	1
 'Setting 0 resets timestamp to session default timestamp'
 SET @@timestamp = -1000000000;
 Warnings:
 Warning	1292	Truncated incorrect timestamp value: '-1000000000'
-SELECT @@timestamp = UNIX_TIMESTAMP();
-@@timestamp = UNIX_TIMESTAMP()
-1
+SELECT floor(@@timestamp) = UNIX_TIMESTAMP(), @@timestamp = UNIX_TIMESTAMP(NOW(6));
+floor(@@timestamp) = UNIX_TIMESTAMP()	@@timestamp = UNIX_TIMESTAMP(NOW(6))
+1	1
 SET @temp_ts = @@timestamp - @@timestamp;
 SELECT @temp_ts;
 @temp_ts
 0
+SET @@timestamp = 1.1;
+SELECT @@timestamp;
+@@timestamp
+1.100000
+SET @@timestamp = 9999999999999999999999;
+Warnings:
+Warning	1292	Truncated incorrect timestamp value: '1e22'
+SELECT @@timestamp;
+@@timestamp
+2147483647.000000
 '#--------------------FN_DYNVARS_001_04-------------------------#'
 SET @@timestamp = "100";
 ERROR 42000: Incorrect argument type to variable 'timestamp'
 SET @@timestamp = " ";
 ERROR 42000: Incorrect argument type to variable 'timestamp'
-SET @@timestamp = 1.1;
-ERROR 42000: Incorrect argument type to variable 'timestamp'
-SET @@timestamp = 9999999999999999999999;
-ERROR 42000: Incorrect argument type to variable 'timestamp'
 '#----------------------FN_DYNVARS_001_06------------------------#'
 '#---------------------FN_DYNVARS_001_08-------------------------#'
 SET @@timestamp = OFF;
@@ -41,7 +47,7 @@ ERROR 42000: Incorrect argument type to variable 'timestamp'
 SET @@timestamp = TRUE;
 SELECT @@timestamp;
 @@timestamp
-1
+1.000000
 SET @@timestamp = FALSE;
 '#---------------------FN_DYNVARS_001_10----------------------#'
 SET @@timestamp = 123456;
@@ -56,7 +62,7 @@ SELECT @@timestamp = @@local.timestamp and @@timestamp = @@session.timestamp;
 SET timestamp = 1;
 SELECT @@timestamp;
 @@timestamp
-1
+1.000000
 SELECT local.timestamp;
 ERROR 42S02: Unknown table 'local' in field list
 SELECT session.timestamp;
diff --git a/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result
index 3455b9479c0..cbd25426408 100644
--- a/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result
@@ -6,7 +6,6 @@ SET @start_session_value = @@session.transaction_prealloc_size;
 SELECT @start_session_value;
 @start_session_value
 4096
-'Bug# 34876: This variable has invalid default value as compared to documentation';
 '#--------------------FN_DYNVARS_005_01-------------------------#'
 SET @@global.transaction_prealloc_size = 100;
 Warnings:
@@ -37,23 +36,19 @@ SELECT @@global.transaction_prealloc_size;
 @@global.transaction_prealloc_size
 1024
 SET @@global.transaction_prealloc_size = 60020;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '60020'
 SELECT @@global.transaction_prealloc_size;
 @@global.transaction_prealloc_size
 59392
-SET @@global.transaction_prealloc_size = 4294966272;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4294966272
 '#--------------------FN_DYNVARS_005_04-------------------------#'
 SET @@session.transaction_prealloc_size = 1024;
 SELECT @@session.transaction_prealloc_size;
 @@session.transaction_prealloc_size
 1024
-SET @@session.transaction_prealloc_size =4294966272;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4294966272
 SET @@session.transaction_prealloc_size = 65535;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '65535'
 SELECT @@session.transaction_prealloc_size;
 @@session.transaction_prealloc_size
 64512
@@ -70,7 +65,6 @@ Warning	1292	Truncated incorrect transaction_prealloc_size value: '-1024'
 SELECT @@global.transaction_prealloc_size;
 @@global.transaction_prealloc_size
 1024
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
 SET @@global.transaction_prealloc_size = ON;
 ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
 SET @@global.transaction_prealloc_size = OFF;
@@ -115,10 +109,6 @@ SELECT @@session.transaction_prealloc_size;
 1024
 SET @@session.transaction_prealloc_size = "Test";
 ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = 123456789031;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-123456788480
 '#------------------FN_DYNVARS_005_06-----------------------#'
 SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
@@ -138,7 +128,7 @@ Warnings:
 Warning	1292	Truncated incorrect transaction_prealloc_size value: '10'
 SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
 @@transaction_prealloc_size = @@global.transaction_prealloc_size
-0
+1
 '#---------------------FN_DYNVARS_001_10----------------------#'
 SET @@transaction_prealloc_size = 100;
 Warnings:
@@ -151,6 +141,8 @@ SELECT @@local.transaction_prealloc_size = @@session.transaction_prealloc_size;
 1
 '#---------------------FN_DYNVARS_001_11----------------------#'
 SET transaction_prealloc_size = 1027;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '1027'
 SELECT @@transaction_prealloc_size;
 @@transaction_prealloc_size
 1024
diff --git a/mysql-test/suite/sys_vars/t/all_vars-master.opt b/mysql-test/suite/sys_vars/t/all_vars-master.opt
index 48457b17309..b97ca7bb3cd 100644
--- a/mysql-test/suite/sys_vars/t/all_vars-master.opt
+++ b/mysql-test/suite/sys_vars/t/all_vars-master.opt
@@ -1 +1,6 @@
 --loose-innodb
+--loose-archive
+--loose-blackhole
+--loose-federated
+--loose-oqgraph
+--loose-sphinx
diff --git a/mysql-test/suite/sys_vars/t/all_vars.test b/mysql-test/suite/sys_vars/t/all_vars.test
index d432aff7cc6..054a74277da 100644
--- a/mysql-test/suite/sys_vars/t/all_vars.test
+++ b/mysql-test/suite/sys_vars/t/all_vars.test
@@ -73,10 +73,12 @@ delete from t2 where variable_name='innodb_change_buffering_debug';
 
 update t2 set variable_name= replace(variable_name, "PERFORMANCE_SCHEMA_", "PFS_");
 
-select variable_name as `There should be *no* long test name listed below:` from t2
+--sorted_result
+select distinct variable_name as `There should be *no* long test name listed below:` from t2
   where length(variable_name) > 50;
 
-select variable_name as `There should be *no* variables listed below:` from t2
+--sorted_result
+select distinct variable_name as `There should be *no* variables listed below:` from t2
   left join t1 on variable_name=test_name where test_name is null;
 
 drop table t1;
diff --git a/mysql-test/suite/sys_vars/t/binlog_checksum_basic.test b/mysql-test/suite/sys_vars/t/binlog_checksum_basic.test
new file mode 100644
index 00000000000..fb3d8e33fa1
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/binlog_checksum_basic.test
@@ -0,0 +1,25 @@
+--source include/not_embedded.inc
+
+# suite/rpl/t/rpl_checksum.test contains similar testing of 
+# all checksum related system variables.
+
+set @save_binlog_checksum= @@global.binlog_checksum;
+set @@global.binlog_checksum = default;
+
+select @@global.binlog_checksum as 'must be NONE by default';
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.binlog_checksum as 'no session var';
+
+
+# testing lack of side-effects in non-effective update of binlog_checksum:
+set @@global.binlog_checksum = CRC32;
+set @@global.binlog_checksum = CRC32; 
+
+set @@global.master_verify_checksum = 0;
+set @@global.master_verify_checksum = default;
+
+--error ER_WRONG_VALUE_FOR_VAR
+set @@global.binlog_checksum = ADLER32;
+
+# cleanup
+set @@global.binlog_checksum = @save_binlog_checksum;
diff --git a/mysql-test/suite/sys_vars/t/disabled.def b/mysql-test/suite/sys_vars/t/disabled.def
index 1cabae00b6f..888298bbb09 100644
--- a/mysql-test/suite/sys_vars/t/disabled.def
+++ b/mysql-test/suite/sys_vars/t/disabled.def
@@ -9,9 +9,3 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-query_cache_size_basic_32           : Bug#11748572: Allocating a large query cache is not deterministic
-query_cache_size_basic_64           : Bug#11748572: Allocating a large query cache is not deterministic
-transaction_prealloc_size_basic_32  : Bug#11748572
-transaction_prealloc_size_basic_64  : Bug#11748572
-#thread_cache_size_func             : Bug#11750172: 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads
-
diff --git a/mysql-test/suite/sys_vars/t/general_log_file_basic.test b/mysql-test/suite/sys_vars/t/general_log_file_basic.test
index 43d7414a0c2..3cc1eb80822 100644
--- a/mysql-test/suite/sys_vars/t/general_log_file_basic.test
+++ b/mysql-test/suite/sys_vars/t/general_log_file_basic.test
@@ -45,8 +45,7 @@ SELECT @start_value;
 ############################################### 
 
 SET @@global.general_log_file = DEFAULT;
-SET @a=concat(left(@@hostname, instr(concat(@@hostname, '.'), '.')-1), '.log');
-SELECT RIGHT(@@global.general_log_file, length(@a)) = @a;
+SELECT @@global.general_log_file;
 
 
 --echo '#--------------------FN_DYNVARS_004_02------------------------#'
diff --git a/mysql-test/suite/sys_vars/t/log_output_func.test b/mysql-test/suite/sys_vars/t/log_output_func.test
index 007c4f38659..6b7c01a7dab 100644
--- a/mysql-test/suite/sys_vars/t/log_output_func.test
+++ b/mysql-test/suite/sys_vars/t/log_output_func.test
@@ -26,7 +26,8 @@
 
 SET @start_value= @@global.log_output;
 SET @start_general_log= @@global.general_log;
-SET @start_general_log_file= @@global.general_log_file;
+#SET @start_general_log_file= @@global.general_log_file;
+LET $start_general_log_file= `SELECT @@global.general_log_file`;
 
 --echo '#--------------------FN_DYNVARS_065_01-------------------------#'
 ##################################################################
@@ -113,7 +114,9 @@ file_exists $MYSQLTEST_VARDIR/run/mytest.log ;
 --echo connection default;
 connection default;
 SET @@global.general_log= 'OFF';
-SET @@global.general_log_file= @start_general_log_file;
+#SET @@global.general_log_file= @start_general_log_file;
+--replace_result $start_general_log_file start_general_log_file
+eval SET @@global.general_log_file= '$start_general_log_file';
 SET @@global.log_output= @start_value;
 SET @@global.general_log= @start_general_log;
 SET @@global.general_log= 'ON';
diff --git a/mysql-test/suite/sys_vars/t/maria_block_size_basic.test b/mysql-test/suite/sys_vars/t/maria_block_size_basic.test
deleted file mode 100644
index 5acfcab539a..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_block_size_basic.test
+++ /dev/null
@@ -1,24 +0,0 @@
-# ulong readonly
-
---source include/have_maria.inc
-#
-# show the global and session values;
-#
-select @@global.maria_block_size, @@global.aria_block_size;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.maria_block_size, @@session.aria_block_size;
-show global variables like '%aria_block_size';
-show session variables like '%aria_block_size';
---sorted_result
-select * from information_schema.global_variables where variable_name like '%aria_block_size';
---sorted_result
-select * from information_schema.session_variables where variable_name like '%aria_block_size';
-
-#
-# show that it's read-only
-#
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-set global maria_block_size=1;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-set session maria_block_size=1;
-
diff --git a/mysql-test/suite/sys_vars/t/maria_checkpoint_interval_basic.test b/mysql-test/suite/sys_vars/t/maria_checkpoint_interval_basic.test
deleted file mode 100644
index ccbf9ee8eb0..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_checkpoint_interval_basic.test
+++ /dev/null
@@ -1,43 +0,0 @@
-# ulong global
---source include/have_maria.inc
-
-SET @start_global_value = @@global.maria_checkpoint_interval;
-
-#
-# exists as global only
-#
-select @@global.maria_checkpoint_interval, @@global.aria_checkpoint_interval;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.maria_checkpoint_interval, @@session.aria_checkpoint_interval;
-show global variables like '%aria_checkpoint_interval';
-show session variables like '%aria_checkpoint_interval';
-select * from information_schema.global_variables where variable_name='maria_checkpoint_interval';
-select * from information_schema.session_variables where variable_name='maria_checkpoint_interval';
-
-#
-# show that it's writable
-#
-set global maria_checkpoint_interval=1;
-select @@global.maria_checkpoint_interval, @@global.aria_checkpoint_interval;
---error ER_GLOBAL_VARIABLE
-set session maria_checkpoint_interval=1;
-
-#
-# incorrect types
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_checkpoint_interval=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_checkpoint_interval=1e1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_checkpoint_interval="foo";
-
-#
-# min/max values
-#
-set global maria_checkpoint_interval=0;
-select @@global.maria_checkpoint_interval, @@global.aria_checkpoint_interval;
-set global maria_checkpoint_interval=cast(-1 as unsigned int);
-select @@global.maria_checkpoint_interval, @@global.aria_checkpoint_interval;
-
-SET @@global.maria_checkpoint_interval = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/maria_force_start_after_recovery_failures_basic.test b/mysql-test/suite/sys_vars/t/maria_force_start_after_recovery_failures_basic.test
deleted file mode 100644
index a6b69561a7e..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_force_start_after_recovery_failures_basic.test
+++ /dev/null
@@ -1,22 +0,0 @@
-# ulong readonly
-
---source include/have_maria.inc
-#
-# show the global and session values;
-#
-select @@global.maria_force_start_after_recovery_failures, @@global.aria_force_start_after_recovery_failures;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.maria_force_start_after_recovery_failures, @@session.aria_force_start_after_recovery_failures;
-show global variables like '%aria_force_start_after_recovery_failures';
-show session variables like '%aria_force_start_after_recovery_failures';
-select * from information_schema.global_variables where variable_name='maria_force_start_after_recovery_failures';
-select * from information_schema.session_variables where variable_name='maria_force_start_after_recovery_failures';
-
-#
-# show that it's read-only
-#
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-set global maria_force_start_after_recovery_failures=1;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-set session maria_force_start_after_recovery_failures=1;
-
diff --git a/mysql-test/suite/sys_vars/t/maria_group_commit_basic.test b/mysql-test/suite/sys_vars/t/maria_group_commit_basic.test
deleted file mode 100644
index 09a9cb6f46e..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_group_commit_basic.test
+++ /dev/null
@@ -1,47 +0,0 @@
-# enum global
---source include/have_maria.inc
-
-SET @start_global_value = @@global.maria_group_commit;
-
-#
-# exists as global only
-#
-select @@global.maria_group_commit, @@global.aria_group_commit;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.maria_group_commit, @@session.aria_group_commit;
-show global variables like '%aria_group_commit';
-show session variables like '%aria_group_commit';
-select * from information_schema.global_variables where variable_name='maria_group_commit';
-select * from information_schema.session_variables where variable_name='maria_group_commit';
-
-#
-# show that it's writable
-#
-set global maria_group_commit=1;
-select @@global.maria_group_commit, @@global.aria_group_commit;
---error ER_GLOBAL_VARIABLE
-set session maria_group_commit=1;
-
-#
-# all valid values
-#
-set global maria_group_commit=none;
-select @@global.maria_group_commit, @@global.aria_group_commit;
-set global maria_group_commit=hard;
-select @@global.maria_group_commit, @@global.aria_group_commit;
-set global maria_group_commit=soft;
-select @@global.maria_group_commit, @@global.aria_group_commit;
-
-#
-# incorrect types/values
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_group_commit=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_group_commit=1e1;
---error ER_WRONG_VALUE_FOR_VAR
-set global maria_group_commit="foo";
---error ER_WRONG_VALUE_FOR_VAR
-set global maria_group_commit=3;
-
-SET @@global.maria_group_commit = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/maria_group_commit_interval_basic.test b/mysql-test/suite/sys_vars/t/maria_group_commit_interval_basic.test
deleted file mode 100644
index d60219fad5e..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_group_commit_interval_basic.test
+++ /dev/null
@@ -1,43 +0,0 @@
-# ulong global
---source include/have_maria.inc
-
-SET @start_global_value = @@global.maria_group_commit_interval;
-
-#
-# exists as global only
-#
-select @@global.maria_group_commit_interval, @@global.aria_group_commit_interval;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.maria_group_commit_interval, @@session.aria_group_commit_interval;
-show global variables like '%aria_group_commit_interval';
-show session variables like '%aria_group_commit_interval';
-select * from information_schema.global_variables where variable_name='maria_group_commit_interval';
-select * from information_schema.session_variables where variable_name='maria_group_commit_interval';
-
-#
-# show that it's writable
-#
-set global maria_group_commit_interval=1;
-select @@global.maria_group_commit_interval, @@global.aria_group_commit_interval;
---error ER_GLOBAL_VARIABLE
-set session maria_group_commit_interval=1;
-
-#
-# incorrect types
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_group_commit_interval=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_group_commit_interval=1e1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_group_commit_interval="foo";
-
-#
-# min/max values
-#
-set global maria_group_commit_interval=0;
-select @@global.maria_group_commit_interval, @@global.aria_group_commit_interval;
-set global maria_group_commit_interval=cast(-1 as unsigned int);
-select @@global.maria_group_commit_interval, @@global.aria_group_commit_interval;
-
-SET @@global.maria_group_commit_interval = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/maria_log_file_size_basic.test b/mysql-test/suite/sys_vars/t/maria_log_file_size_basic.test
deleted file mode 100644
index 367ee6c3365..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_log_file_size_basic.test
+++ /dev/null
@@ -1,47 +0,0 @@
-# ulong global
---source include/have_maria.inc
-
-SET @start_global_value = @@global.maria_log_file_size;
-
-#
-# exists as global only
-#
-select @@global.maria_log_file_size, @@global.aria_log_file_size;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.maria_log_file_size, @@session.aria_log_file_size;
-show global variables like '%aria_log_file_size';
-show session variables like '%aria_log_file_size';
-select * from information_schema.global_variables where variable_name like '%aria_log_file_size';
-select * from information_schema.session_variables where variable_name like '%aria_log_file_size';
-
-#
-# show that it's writable
-#
-set global maria_log_file_size=1024*1024*10;
-select @@global.maria_log_file_size, @@global.aria_log_file_size;
---error ER_GLOBAL_VARIABLE
-set session maria_log_file_size=1;
-
-#
-# incorrect types
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_log_file_size=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_log_file_size=1e1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_log_file_size="foo";
-
-#
-# min/max values, block size
-#
-set global maria_log_file_size=1;
-select @@global.maria_log_file_size, @@global.aria_log_file_size;
-set global maria_log_file_size=@@global.maria_log_file_size + 8192 - 1;
-select @@global.maria_log_file_size, @@global.aria_log_file_size;
-set global maria_log_file_size=@@global.maria_log_file_size + 8192;
-select @@global.maria_log_file_size, @@global.aria_log_file_size;
-set global maria_log_file_size=cast(-1 as unsigned int);
-select @@global.maria_log_file_size, @@global.aria_log_file_size;
-
-SET @@global.maria_log_file_size = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/maria_log_purge_type_basic.test b/mysql-test/suite/sys_vars/t/maria_log_purge_type_basic.test
deleted file mode 100644
index 1bf6221922c..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_log_purge_type_basic.test
+++ /dev/null
@@ -1,47 +0,0 @@
-# enum global
---source include/have_maria.inc
-
-SET @start_global_value = @@global.maria_log_purge_type;
-
-#
-# exists as global only
-#
-select @@global.maria_log_purge_type, @@global.aria_log_purge_type;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.maria_log_purge_type, @@session.aria_log_purge_type;
-show global variables like '%aria_log_purge_type';
-show session variables like '%aria_log_purge_type';
-select * from information_schema.global_variables where variable_name like '%aria_log_purge_type';
-select * from information_schema.session_variables where variable_name like '%aria_log_purge_type';
-
-#
-# show that it's writable
-#
-set global maria_log_purge_type=1;
-select @@global.maria_log_purge_type, @@global.aria_log_purge_type;
---error ER_GLOBAL_VARIABLE
-set session maria_log_purge_type=1;
-
-#
-# all valid values
-#
-set global maria_log_purge_type=immediate;
-select @@global.maria_log_purge_type, @@global.aria_log_purge_type;
-set global maria_log_purge_type=external;
-select @@global.maria_log_purge_type, @@global.aria_log_purge_type;
-set global maria_log_purge_type=at_flush;
-select @@global.maria_log_purge_type, @@global.aria_log_purge_type;
-
-#
-# incorrect types/values
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_log_purge_type=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_log_purge_type=1e1;
---error ER_WRONG_VALUE_FOR_VAR
-set global maria_log_purge_type="foo";
---error ER_WRONG_VALUE_FOR_VAR
-set global maria_log_purge_type=3;
-
-SET @@global.maria_log_purge_type = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/maria_max_sort_file_size_basic.test b/mysql-test/suite/sys_vars/t/maria_max_sort_file_size_basic.test
deleted file mode 100644
index 1879449935b..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_max_sort_file_size_basic.test
+++ /dev/null
@@ -1,49 +0,0 @@
-# ulong global
---source include/have_maria.inc
-
-SET @start_global_value = @@global.maria_max_sort_file_size;
-
-#
-# exists as global only
-#
-select @@global.maria_max_sort_file_size, @@global.aria_max_sort_file_size;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.maria_max_sort_file_size, @@session.aria_max_sort_file_size;
-show global variables like '%aria_max_sort_file_size';
-show session variables like '%aria_max_sort_file_size';
---sorted_result
-select * from information_schema.global_variables where variable_name like '%aria_max_sort_file_size';
---sorted_result
-select * from information_schema.session_variables where variable_name like '%aria_max_sort_file_size';
-
-#
-# show that it's writable
-#
-set global maria_max_sort_file_size=1024*1024*10;
-select @@global.maria_max_sort_file_size, @@global.aria_max_sort_file_size;
---error ER_GLOBAL_VARIABLE
-set session maria_max_sort_file_size=1;
-
-#
-# incorrect types
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_max_sort_file_size=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_max_sort_file_size=1e1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_max_sort_file_size="foo";
-
-#
-# min/max values, block size
-#
-set global maria_max_sort_file_size=1;
-select @@global.maria_max_sort_file_size, @@global.aria_max_sort_file_size;
-set global maria_max_sort_file_size=@@global.maria_max_sort_file_size + 1024*1024 - 1;
-select @@global.maria_max_sort_file_size, @@global.aria_max_sort_file_size;
-set global maria_max_sort_file_size=@@global.maria_max_sort_file_size + 1024*1024;
-select @@global.maria_max_sort_file_size, @@global.aria_max_sort_file_size;
-set global maria_max_sort_file_size=cast(-1 as unsigned int);
-select @@global.maria_max_sort_file_size, @@global.aria_max_sort_file_size;
-
-SET @@global.maria_max_sort_file_size = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/maria_page_checksum_basic.test b/mysql-test/suite/sys_vars/t/maria_page_checksum_basic.test
deleted file mode 100644
index 2085abdffd5..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_page_checksum_basic.test
+++ /dev/null
@@ -1,39 +0,0 @@
-# bool global
---source include/have_maria.inc
-
-SET @start_global_value = @@global.maria_page_checksum;
-
-#
-# exists as global only
-#
-select @@global.maria_page_checksum, @@global.aria_page_checksum;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.maria_page_checksum, @@session.aria_page_checksum;
-show global variables like '%aria_page_checksum';
-show session variables like '%aria_page_checksum';
-select * from information_schema.global_variables where variable_name like '%aria_page_checksum';
-select * from information_schema.session_variables where variable_name like '%aria_page_checksum';
-
-#
-# show that it's writable
-#
-set global maria_page_checksum=ON;
-select @@global.maria_page_checksum, @@global.aria_page_checksum;
-set global maria_page_checksum=OFF;
-select @@global.maria_page_checksum, @@global.aria_page_checksum;
-set global maria_page_checksum=1;
-select @@global.maria_page_checksum, @@global.aria_page_checksum;
---error ER_GLOBAL_VARIABLE
-set session maria_page_checksum=1;
-
-#
-# incorrect types
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_page_checksum=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_page_checksum=1e1;
---error ER_WRONG_VALUE_FOR_VAR
-set global maria_page_checksum="foo";
-
-SET @@global.maria_page_checksum = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/maria_pagecache_age_threshold_basic.test b/mysql-test/suite/sys_vars/t/maria_pagecache_age_threshold_basic.test
deleted file mode 100644
index 17204db2c6c..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_pagecache_age_threshold_basic.test
+++ /dev/null
@@ -1,47 +0,0 @@
-# ulong global
---source include/have_maria.inc
-
-SET @start_global_value = @@global.maria_pagecache_age_threshold;
-
-#
-# exists as global only
-#
-select @@global.maria_pagecache_age_threshold, @@global.aria_pagecache_age_threshold;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.maria_pagecache_age_threshold, @@session.aria_pagecache_age_threshold;
-show global variables like '%aria_pagecache_age_threshold';
-show session variables like '%aria_pagecache_age_threshold';
-select * from information_schema.global_variables where variable_name like '%aria_pagecache_age_threshold';
-select * from information_schema.session_variables where variable_name like '%aria_pagecache_age_threshold';
-
-#
-# show that it's writable
-#
-set global maria_pagecache_age_threshold=200;
-select @@global.maria_pagecache_age_threshold, @@global.aria_pagecache_age_threshold;
---error ER_GLOBAL_VARIABLE
-set session maria_pagecache_age_threshold=1;
-
-#
-# incorrect types
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_pagecache_age_threshold=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_pagecache_age_threshold=1e1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_pagecache_age_threshold="foo";
-
-#
-# min/max values, block size
-#
-set global maria_pagecache_age_threshold=1;
-select @@global.maria_pagecache_age_threshold, @@global.aria_pagecache_age_threshold;
-set global maria_pagecache_age_threshold=@@global.maria_pagecache_age_threshold + 100 - 1;
-select @@global.maria_pagecache_age_threshold, @@global.aria_pagecache_age_threshold;
-set global maria_pagecache_age_threshold=@@global.maria_pagecache_age_threshold + 100;
-select @@global.maria_pagecache_age_threshold, @@global.aria_pagecache_age_threshold;
-set global maria_pagecache_age_threshold=cast(-1 as unsigned int);
-select @@global.maria_pagecache_age_threshold, @@global.aria_pagecache_age_threshold;
-
-SET @@global.maria_pagecache_age_threshold = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/maria_pagecache_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/maria_pagecache_buffer_size_basic.test
deleted file mode 100644
index 1c37d2014db..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_pagecache_buffer_size_basic.test
+++ /dev/null
@@ -1,22 +0,0 @@
-# ulong readonly
-
---source include/have_maria.inc
-#
-# show the global and session values;
-#
-select @@global.maria_pagecache_buffer_size, @@global.aria_pagecache_buffer_size;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.maria_pagecache_buffer_size, @@session.aria_pagecache_buffer_size;
-show global variables like '%aria_pagecache_buffer_size';
-show session variables like '%aria_pagecache_buffer_size';
-select * from information_schema.global_variables where variable_name like '%aria_pagecache_buffer_size';
-select * from information_schema.session_variables where variable_name like '%aria_pagecache_buffer_size';
-
-#
-# show that it's read-only
-#
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-set global maria_pagecache_buffer_size=1;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-set session maria_pagecache_buffer_size=1;
-
diff --git a/mysql-test/suite/sys_vars/t/maria_pagecache_division_limit_basic.test b/mysql-test/suite/sys_vars/t/maria_pagecache_division_limit_basic.test
deleted file mode 100644
index c68cb05de10..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_pagecache_division_limit_basic.test
+++ /dev/null
@@ -1,43 +0,0 @@
-# ulong global
---source include/have_maria.inc
-
-SET @start_global_value = @@global.maria_pagecache_division_limit;
-
-#
-# exists as global only
-#
-select @@global.maria_pagecache_division_limit, @@global.aria_pagecache_division_limit;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.maria_pagecache_division_limit, @@session.aria_pagecache_division_limit;
-show global variables like '%aria_pagecache_division_limit';
-show session variables like '%aria_pagecache_division_limit';
-select * from information_schema.global_variables where variable_name like '%aria_pagecache_division_limit';
-select * from information_schema.session_variables where variable_name like '%aria_pagecache_division_limit';
-
-#
-# show that it's writable
-#
-set global maria_pagecache_division_limit=20;
-select @@global.maria_pagecache_division_limit, @@global.aria_pagecache_division_limit;
---error ER_GLOBAL_VARIABLE
-set session maria_pagecache_division_limit=1;
-
-#
-# incorrect types
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_pagecache_division_limit=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_pagecache_division_limit=1e1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_pagecache_division_limit="foo";
-
-#
-# min/max values, block size
-#
-set global maria_pagecache_division_limit=0;
-select @@global.maria_pagecache_division_limit, @@global.aria_pagecache_division_limit;
-set global maria_pagecache_division_limit=cast(-1 as unsigned int);
-select @@global.maria_pagecache_division_limit, @@global.aria_pagecache_division_limit;
-
-SET @@global.maria_pagecache_division_limit = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/maria_recover_basic.test b/mysql-test/suite/sys_vars/t/maria_recover_basic.test
deleted file mode 100644
index d188339929d..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_recover_basic.test
+++ /dev/null
@@ -1,51 +0,0 @@
-# enum global
---source include/have_maria.inc
-
-SET @start_global_value = @@global.maria_recover;
-
-#
-# exists as global only
-#
-select @@global.maria_recover, @@global.aria_recover;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.maria_recover, @@session.aria_recover;
-show global variables like '%aria_recover';
-show session variables like '%aria_recover';
-select * from information_schema.global_variables where variable_name like '%aria_recover';
-select * from information_schema.session_variables where variable_name like '%aria_recover';
-
-#
-# show that it's writable
-#
-set global maria_recover=1;
-select @@global.maria_recover, @@global.aria_recover;
---error ER_GLOBAL_VARIABLE
-set session maria_recover=1;
-
-#
-# all valid values
-#
-set global maria_recover=normal;
-select @@global.maria_recover, @@global.aria_recover;
-set global maria_recover=backup;
-select @@global.maria_recover, @@global.aria_recover;
-set global maria_recover='force';
-select @@global.maria_recover, @@global.aria_recover;
-set global maria_recover=`quick`;
-select @@global.maria_recover, @@global.aria_recover;
-set global maria_recover=off;
-select @@global.maria_recover, @@global.aria_recover;
-
-#
-# incorrect types/values
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_recover=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_recover=1e1;
---error ER_WRONG_VALUE_FOR_VAR
-set global maria_recover="foo";
---error ER_WRONG_VALUE_FOR_VAR
-set global maria_recover=5;
-
-SET @@global.maria_recover = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/maria_repair_threads_basic.test b/mysql-test/suite/sys_vars/t/maria_repair_threads_basic.test
deleted file mode 100644
index 7f66d18f528..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_repair_threads_basic.test
+++ /dev/null
@@ -1,43 +0,0 @@
-# ulong session
---source include/have_maria.inc
-
-SET @start_global_value = @@global.maria_repair_threads;
-
-#
-# exists as global only
-#
-select @@global.maria_repair_threads, @@global.aria_repair_threads;
-select @@session.maria_repair_threads, @@session.aria_repair_threads;
-show global variables like '%aria_repair_threads';
-show session variables like '%aria_repair_threads';
-select * from information_schema.global_variables where variable_name like '%aria_repair_threads';
-select * from information_schema.session_variables where variable_name like '%aria_repair_threads';
-
-#
-# show that it's writable
-#
-set global maria_repair_threads=10;
-select @@global.maria_repair_threads, @@global.aria_repair_threads;
-set session maria_repair_threads=10;
-select @@session.maria_repair_threads, @@session.aria_repair_threads;
-
-#
-# incorrect types
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_repair_threads=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set session maria_repair_threads=1e1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_repair_threads="foo";
-
-#
-# min/max values, block size
-#
-set global maria_repair_threads=0;
-select @@global.maria_repair_threads, @@global.aria_repair_threads;
-set session maria_repair_threads=cast(-1 as unsigned int);
-select @@session.maria_repair_threads, @@session.aria_repair_threads;
-
-SET @@global.maria_repair_threads = @start_global_value;
-
diff --git a/mysql-test/suite/sys_vars/t/maria_sort_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/maria_sort_buffer_size_basic.test
deleted file mode 100644
index 7887e2d19b5..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_sort_buffer_size_basic.test
+++ /dev/null
@@ -1,43 +0,0 @@
-# ulong session
---source include/have_maria.inc
-
-SET @start_global_value = @@global.maria_sort_buffer_size;
-
-#
-# exists as global only
-#
-select @@global.maria_sort_buffer_size, @@global.aria_sort_buffer_size;
-select @@session.maria_sort_buffer_size, @@session.aria_sort_buffer_size;
-show global variables like '%aria_sort_buffer_size';
-show session variables like '%aria_sort_buffer_size';
-select * from information_schema.global_variables where variable_name like '%aria_sort_buffer_size';
-select * from information_schema.session_variables where variable_name like '%aria_sort_buffer_size';
-
-#
-# show that it's writable
-#
-set global maria_sort_buffer_size=10;
-select @@global.maria_sort_buffer_size, @@global.aria_sort_buffer_size;
-set session maria_sort_buffer_size=10;
-select @@session.maria_sort_buffer_size, @@session.aria_sort_buffer_size;
-
-#
-# incorrect types
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_sort_buffer_size=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set session maria_sort_buffer_size=1e1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_sort_buffer_size="foo";
-
-#
-# min/max values, block size
-#
-set global maria_sort_buffer_size=0;
-select @@global.maria_sort_buffer_size, @@global.aria_sort_buffer_size;
-set session maria_sort_buffer_size=cast(-1 as unsigned int);
-select @@session.maria_sort_buffer_size, @@session.aria_sort_buffer_size;
-
-SET @@global.maria_sort_buffer_size = @start_global_value;
-
diff --git a/mysql-test/suite/sys_vars/t/maria_stats_method_basic.test b/mysql-test/suite/sys_vars/t/maria_stats_method_basic.test
deleted file mode 100644
index d615705c65a..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_stats_method_basic.test
+++ /dev/null
@@ -1,46 +0,0 @@
-# enum session
---source include/have_maria.inc
-
-SET @start_global_value = @@global.maria_stats_method;
-
-#
-# exists as global only
-#
-select @@global.maria_stats_method, @@global.aria_stats_method;
-select @@session.maria_stats_method, @@session.aria_stats_method;
-show global variables like '%aria_stats_method';
-show session variables like '%aria_stats_method';
-select * from information_schema.global_variables where variable_name like '%aria_stats_method';
-select * from information_schema.session_variables where variable_name like '%aria_stats_method';
-
-#
-# show that it's writable
-#
-set global maria_stats_method=1;
-select @@global.maria_stats_method, @@global.aria_stats_method;
-set session maria_stats_method=1;
-select @@session.maria_stats_method, @@session.aria_stats_method;
-
-#
-# all valid values
-#
-set session maria_stats_method=nulls_unequal;
-select @@session.maria_stats_method, @@session.aria_stats_method;
-set session maria_stats_method=nulls_equal;
-select @@session.maria_stats_method, @@session.aria_stats_method;
-set session maria_stats_method=nulls_ignored;
-select @@session.maria_stats_method, @@session.aria_stats_method;
-
-#
-# incorrect types/values
-#
---error ER_WRONG_TYPE_FOR_VAR
-set session maria_stats_method=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set session maria_stats_method=1e1;
---error ER_WRONG_VALUE_FOR_VAR
-set session maria_stats_method="foo";
---error ER_WRONG_VALUE_FOR_VAR
-set session maria_stats_method=3;
-
-SET @@global.maria_stats_method = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/maria_sync_log_dir_basic.test b/mysql-test/suite/sys_vars/t/maria_sync_log_dir_basic.test
deleted file mode 100644
index 7e9a424cc49..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_sync_log_dir_basic.test
+++ /dev/null
@@ -1,47 +0,0 @@
-# enum global
---source include/have_maria.inc
-
-SET @start_global_value = @@global.maria_sync_log_dir;
-
-#
-# exists as global only
-#
-select @@global.maria_sync_log_dir, @@global.aria_sync_log_dir;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.maria_sync_log_dir, @@session.aria_sync_log_dir;
-show global variables like '%aria_sync_log_dir';
-show session variables like '%aria_sync_log_dir';
-select * from information_schema.global_variables where variable_name like '%aria_sync_log_dir';
-select * from information_schema.session_variables where variable_name like '%aria_sync_log_dir';
-
-#
-# show that it's writable
-#
-set global maria_sync_log_dir=1;
-select @@global.maria_sync_log_dir, @@global.aria_sync_log_dir;
---error ER_GLOBAL_VARIABLE
-set session maria_sync_log_dir=1;
-
-#
-# all valid values
-#
-set global maria_sync_log_dir=never;
-select @@global.maria_sync_log_dir, @@global.aria_sync_log_dir;
-set global maria_sync_log_dir=newfile;
-select @@global.maria_sync_log_dir, @@global.aria_sync_log_dir;
-set global maria_sync_log_dir=always;
-select @@global.maria_sync_log_dir, @@global.aria_sync_log_dir;
-
-#
-# incorrect types/values
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_sync_log_dir=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_sync_log_dir=1e1;
---error ER_WRONG_VALUE_FOR_VAR
-set global maria_sync_log_dir="foo";
---error ER_WRONG_VALUE_FOR_VAR
-set global maria_sync_log_dir=3;
-
-SET @@global.maria_sync_log_dir = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/maria_used_for_temp_tables_basic.test b/mysql-test/suite/sys_vars/t/maria_used_for_temp_tables_basic.test
deleted file mode 100644
index a2bec4660af..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_used_for_temp_tables_basic.test
+++ /dev/null
@@ -1,24 +0,0 @@
-# bool readonly
-
---source include/have_maria.inc
-#
-# show the global and session values;
-#
-select @@global.maria_used_for_temp_tables, @@global.aria_used_for_temp_tables;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.maria_used_for_temp_tables, @@session.aria_used_for_temp_tables;
-show global variables like '%aria_used_for_temp_tables';
-show session variables like '%aria_used_for_temp_tables';
---sorted_result
-select * from information_schema.global_variables where variable_name like '%aria_used_for_temp_tables';
---sorted_result
-select * from information_schema.session_variables where variable_name like '%aria_used_for_temp_tables';
-
-#
-# show that it's read-only
-#
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-set global maria_used_for_temp_tables=1;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-set session maria_used_for_temp_tables=1;
-
diff --git a/mysql-test/suite/sys_vars/t/master_verify_checksum_basic.test b/mysql-test/suite/sys_vars/t/master_verify_checksum_basic.test
new file mode 100644
index 00000000000..b70040ff2a2
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/master_verify_checksum_basic.test
@@ -0,0 +1,19 @@
+--source include/not_embedded.inc
+
+# suite/rpl/t/rpl_checksum.test contains similar testing of 
+# all checksum related system variables.
+
+set @save_master_verify_checksum =  @@global.master_verify_checksum;
+
+select @@global.master_verify_checksum  as 'must be zero because of default';
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.master_verify_checksum  as 'no session var';
+
+set @@global.master_verify_checksum = 0;
+set @@global.master_verify_checksum = default;
+
+--error ER_WRONG_VALUE_FOR_VAR
+set @@global.master_verify_checksum = 2; # the var is of bool type
+
+# cleanup
+set @@global.master_verify_checksum = @save_master_verify_checksum;
diff --git a/mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func-master.opt b/mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func-master.opt
new file mode 100644
index 00000000000..d392e2e4262
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func-master.opt
@@ -0,0 +1 @@
+--log-error='dummy.log'
diff --git a/mysql-test/suite/sys_vars/t/new_basic.test b/mysql-test/suite/sys_vars/t/new_basic.test
deleted file mode 100644
index 017ba2eb264..00000000000
--- a/mysql-test/suite/sys_vars/t/new_basic.test
+++ /dev/null
@@ -1,217 +0,0 @@
-############## mysql-test\t\new_basic.test ####################################
-#                                                                             #
-# Variable Name: new                                                          #
-# Scope: GLOBAL | SESSION                                                     #
-# Access Type: Dynamic                                                        #
-# Data Type: boolean                                                          #
-# Default Value: FALSE                                                        #
-# Range:                                                                      #
-#                                                                             #
-#                                                                             #
-# Creation Date: 2008-02-14                                                   #
-# Author:  Salman                                                             #
-#                                                                             #
-# Description: Test Cases of Dynamic System Variable "new"                    #
-#              that checks the behavior of this variable in the following ways#
-#              * Default Value                                                #
-#              * Valid & Invalid values                                       #
-#              * Scope & Access method                                        #
-#              * Data Integrity                                               #
-#                                                                             #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/                          #
-#  server-system-variables.html#option_mysqld_new                             #
-#                                                                             #
-###############################################################################
-
---source include/load_sysvars.inc
-###################################################
-#           START OF new TESTS                    #
-###################################################
-
-
-#############################################################
-#                 Save initial value                        #
-#############################################################
-
-SET @start_global_value = @@global.new;
-SELECT @start_global_value;
-SET @start_session_value = @@session.new;
-SELECT @start_session_value;
-
-
---echo '#--------------------FN_DYNVARS_113_01-------------------------#'
-###################################################
-#     Display the DEFAULT value of new            #
-###################################################
-
-SET @@global.new = ON;
-SET @@global.new = DEFAULT;
-SELECT @@global.new;
-
-SET @@session.new = ON;
-SET @@session.new = DEFAULT;
-SELECT @@session.new;
-
-
---echo '#--------------------FN_DYNVARS_113_02-------------------------#'
-###################################################
-#     Check the DEFAULT value of new              #
-###################################################
-
-SET @@global.new = DEFAULT;
-SELECT @@global.new = 'OFF';
-
-SET @@session.new = DEFAULT;
-SELECT @@session.new = 'OFF';
-
-
---echo '#--------------------FN_DYNVARS_113_03-------------------------#'
-#############################################################
-# Change the value of new to a valid value for GLOBAL Scope #
-#############################################################
-
-SET @@global.new = ON;
-SELECT @@global.new;
-SET @@global.new = OFF;
-SELECT @@global.new;
-SET @@global.new = 0;
-SELECT @@global.new;
-SET @@global.new = 1;
-SELECT @@global.new;
-SET @@global.new = TRUE;
-SELECT @@global.new;
-SET @@global.new = FALSE;
-SELECT @@global.new;
-
-
-
---echo '#--------------------FN_DYNVARS_113_04-------------------------#'
-##############################################################
-# Change the value of new to a valid value for SESSION Scope #
-##############################################################
- 
-SET @@session.new = ON;
-SELECT @@session.new;
-SET @@session.new = OFF;
-SELECT @@session.new;
-SET @@session.new = 0;
-SELECT @@session.new;
-SET @@session.new = 1;
-SELECT @@session.new;
-SET @@session.new = TRUE;
-SELECT @@session.new;
-SET @@session.new = FALSE;
-SELECT @@session.new;
-
-
---echo '#------------------FN_DYNVARS_113_05-----------------------#'
-###############################################
-# Change the value of new to an invalid value #
-###############################################
-
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.new = 'ONN';
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.new = "OFFF";
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.new = TTRUE;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.new = FELSE;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.new = -1024;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.new = 65536;
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.new = 65530.34;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.new = test;
-
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.new = ONN;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.new = ONF;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.new = OF;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.new = 'OFN';
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.new = -2;
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.new = 65530.34;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.new = 65550;
-
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.new = test;
-
-
---echo '#------------------FN_DYNVARS_113_06-----------------------#'
-####################################################################
-#   Check if the value in GLOBAL Table matches value in variable   #
-####################################################################
-
-
-SELECT IF(@@global.new, "ON", "OFF") = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='new';
-
---echo '#------------------FN_DYNVARS_113_07-----------------------#'
-####################################################################
-#  Check if the value in SESSION Table matches value in variable   #
-####################################################################
-
-SELECT IF(@@session.new, "ON", "OFF") = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='new';
-
-
-
---echo '#---------------------FN_DYNVARS_113_08----------------------#'
-###############################################################################
-#  Check if global and session variable are independent of each other         #
-###############################################################################
-
-SET @@new = OFF;
-SET @@global.new = ON;
-SELECT @@new = @@global.new;
-
---echo '#---------------------FN_DYNVARS_113_09----------------------#'
-###############################################################################
-#    Check if accessing variable with SESSION,LOCAL and without SCOPE points  #
-#    to same session variable                                                 #
-###############################################################################
-
-SET @@new = ON;
-SELECT @@new = @@local.new;
-SELECT @@local.new = @@session.new;
-
-
---echo '#---------------------FN_DYNVARS_113_10----------------------#'
-##############################################################
-#   Check if new can be accessed with and without @@ sign    #
-##############################################################
-
-SET new = 1;
-SELECT @@new;
---Error ER_UNKNOWN_TABLE
-SELECT local.new;
---Error ER_UNKNOWN_TABLE
-SELECT session.new;
---Error ER_BAD_FIELD_ERROR
-SELECT new = @@session.new;
-
-
-####################################
-#     Restore initial value        #
-####################################
-
-SET @@global.new = @start_global_value;
-SELECT @@global.new;
-SET @@session.new = @start_session_value;
-SELECT @@session.new;
-
-
-########################################
-#                 END OF new TESTS     #
-########################################
-
diff --git a/mysql-test/suite/sys_vars/t/old_basic.test b/mysql-test/suite/sys_vars/t/old_basic.test
index 2c123d17165..f1bb5a52c54 100644
--- a/mysql-test/suite/sys_vars/t/old_basic.test
+++ b/mysql-test/suite/sys_vars/t/old_basic.test
@@ -2,18 +2,14 @@
 # show the global and session values;
 #
 select @@global.old;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
 select @@session.old;
 show global variables like 'old';
 show session variables like 'old';
 select * from information_schema.global_variables where variable_name='old';
 select * from information_schema.session_variables where variable_name='old';
 
-#
-# show that it's read-only
-#
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
 set global old=1;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
 set session old=1;
-
+select @@global.old;
+select @@session.old;
+set @@global.old=DEFAULT;
diff --git a/mysql-test/suite/sys_vars/t/optimizer_switch_basic.test b/mysql-test/suite/sys_vars/t/optimizer_switch_basic.test
index df1a3511fa1..4267b3726aa 100644
--- a/mysql-test/suite/sys_vars/t/optimizer_switch_basic.test
+++ b/mysql-test/suite/sys_vars/t/optimizer_switch_basic.test
@@ -46,13 +46,5 @@ set session optimizer_switch="index_merge";
 --error ER_WRONG_VALUE_FOR_VAR
 set session optimizer_switch="foobar";
 
---echo #
---echo # Bug#59894 set optimizer_switch to e or d causes invalid
---echo # memory writes/valgrind warnings
---echo
-set global optimizer_switch = 'd'; # means default
---error ER_WRONG_VALUE_FOR_VAR
-set global optimizer_switch = 'e';
-
 SET @@global.optimizer_switch = @start_global_value;
 SELECT @@global.optimizer_switch;
diff --git a/mysql-test/suite/sys_vars/t/optimizer_use_mrr_basic.test b/mysql-test/suite/sys_vars/t/optimizer_use_mrr_basic.test
deleted file mode 100644
index bb5f1284614..00000000000
--- a/mysql-test/suite/sys_vars/t/optimizer_use_mrr_basic.test
+++ /dev/null
@@ -1,46 +0,0 @@
-# enum session
---source include/have_maria.inc
-
-SET @start_global_value = @@global.optimizer_use_mrr;
-
-#
-# exists as global only
-#
-select @@global.optimizer_use_mrr;
-select @@session.optimizer_use_mrr;
-show global variables like 'optimizer_use_mrr';
-show session variables like 'optimizer_use_mrr';
-select * from information_schema.global_variables where variable_name='optimizer_use_mrr';
-select * from information_schema.session_variables where variable_name='optimizer_use_mrr';
-
-#
-# show that it's writable
-#
-set global optimizer_use_mrr=1;
-select @@global.optimizer_use_mrr;
-set session optimizer_use_mrr=1;
-select @@session.optimizer_use_mrr;
-
-#
-# all valid values
-#
-set session optimizer_use_mrr='auto';
-select @@session.optimizer_use_mrr;
-set session optimizer_use_mrr='force';
-select @@session.optimizer_use_mrr;
-set session optimizer_use_mrr='disable';
-select @@session.optimizer_use_mrr;
-
-#
-# incorrect types/values
-#
---error ER_WRONG_TYPE_FOR_VAR
-set session optimizer_use_mrr=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set session optimizer_use_mrr=1e1;
---error ER_WRONG_VALUE_FOR_VAR
-set session optimizer_use_mrr="foo";
---error ER_WRONG_VALUE_FOR_VAR
-set session optimizer_use_mrr=3;
-
-SET @@global.optimizer_use_mrr = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/query_cache_type_basic.test b/mysql-test/suite/sys_vars/t/query_cache_type_basic.test
index 5c395fde1e6..19784270306 100644
--- a/mysql-test/suite/sys_vars/t/query_cache_type_basic.test
+++ b/mysql-test/suite/sys_vars/t/query_cache_type_basic.test
@@ -173,12 +173,7 @@ SELECT @@global.query_cache_type;
 # Check if query_cache_type can be accessed with and without @@ sign #
 ######################################################################
 
-SET query_cache_type = 'ON';
-
---Error ER_PARSE_ERROR
-SET session.query_cache_type = 'OFF';
---Error ER_PARSE_ERROR
-SET global.query_cache_type = 'DEMAND';
+SET global query_cache_type = 'ON';
 
 SET session query_cache_type = 1;
 SELECT @@query_cache_type;
diff --git a/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test b/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test
index e7486614ec7..e126a67ff30 100644
--- a/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test
+++ b/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test
@@ -181,7 +181,7 @@ LOCK TABLE t1 WRITE;
 UNLOCK TABLES;
 
 SHOW STATUS LIKE 'Qcache_queries_in_cache';
---echo 1 Expected
+--echo 0 Expected
 
 --echo '#----------------------------FN_DYNVARS_136_04---------------------#'
 #
diff --git a/mysql-test/suite/sys_vars/t/slave_sql_verify_checksum_basic.test b/mysql-test/suite/sys_vars/t/slave_sql_verify_checksum_basic.test
new file mode 100644
index 00000000000..3eb4f4b4e6d
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/slave_sql_verify_checksum_basic.test
@@ -0,0 +1,18 @@
+--source include/not_embedded.inc
+
+# suite/rpl/t/rpl_checksum.test contains similar testing of 
+# all checksum related system variables.
+
+set @save_slave_sql_verify_checksum = @@global.slave_sql_verify_checksum;
+
+select @@global.slave_sql_verify_checksum  as 'must be one because of default';
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.slave_sql_verify_checksum  as 'no session var';
+
+set @@global.slave_sql_verify_checksum = 0;
+set @@global.slave_sql_verify_checksum = default;
+--error ER_WRONG_VALUE_FOR_VAR
+set @@global.slave_sql_verify_checksum = 2; # the var is of bool type
+
+# cleanup
+set @@global.slave_sql_verify_checksum = @save_slave_sql_verify_checksum;
diff --git a/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test b/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test
index bac0d0c8198..cea0baa3cfc 100644
--- a/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test
@@ -43,8 +43,7 @@ SET @start_value = @@global.slow_query_log_file;
 ############################################### 
 
 SET @@global.slow_query_log_file = DEFAULT;
-SET @a=concat(left(@@hostname, instr(concat(@@hostname, '.'), '.')-1), '-slow.log');
-SELECT RIGHT(@@global.slow_query_log_file, length(@a)) = @a;
+SELECT @@global.slow_query_log_file;
 
 
 --echo '#--------------------FN_DYNVARS_004_02------------------------#'
diff --git a/mysql-test/suite/sys_vars/t/sql_log_off_func-master.opt b/mysql-test/suite/sys_vars/t/sql_log_off_func-master.opt
new file mode 100644
index 00000000000..875ecc54b55
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/sql_log_off_func-master.opt
@@ -0,0 +1 @@
+--general-log --log-output=TABLE,FILE
diff --git a/mysql-test/suite/sys_vars/t/timestamp_basic.test b/mysql-test/suite/sys_vars/t/timestamp_basic.test
index a5baf304bf3..8b26622443d 100644
--- a/mysql-test/suite/sys_vars/t/timestamp_basic.test
+++ b/mysql-test/suite/sys_vars/t/timestamp_basic.test
@@ -43,7 +43,7 @@ SET @session_start_value = @@session.timestamp;
 
 
 SET @@timestamp = DEFAULT;
-SELECT @@timestamp = UNIX_TIMESTAMP();
+SELECT floor(@@timestamp) = UNIX_TIMESTAMP(), @@timestamp = UNIX_TIMESTAMP(NOW(6));
 
 --echo '#---------------------FN_DYNVARS_001_02-------------------------#'
 ##############################################################
@@ -59,16 +59,22 @@ SET @@global.timestamp = "1000";
 ######################################################################## 
 
 SET @@timestamp = 0;
-SELECT @@timestamp = UNIX_TIMESTAMP();
+SELECT floor(@@timestamp) = UNIX_TIMESTAMP(), @@timestamp = UNIX_TIMESTAMP(NOW(6));
 
 --echo 'Setting 0 resets timestamp to session default timestamp'
 
 SET @@timestamp = -1000000000;
-SELECT @@timestamp = UNIX_TIMESTAMP();
+SELECT floor(@@timestamp) = UNIX_TIMESTAMP(), @@timestamp = UNIX_TIMESTAMP(NOW(6));
 
 SET @temp_ts = @@timestamp - @@timestamp;
 SELECT @temp_ts;
 
+SET @@timestamp = 1.1;
+SELECT @@timestamp;
+
+SET @@timestamp = 9999999999999999999999;
+SELECT @@timestamp;
+
 --echo '#--------------------FN_DYNVARS_001_04-------------------------#'
 ########################################################################### 
 #               Change the value of timestamp to invalid value            #
@@ -81,14 +87,6 @@ SET @@timestamp = "100";
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@timestamp = " ";
 
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@timestamp = 1.1;
-
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@timestamp = 9999999999999999999999;
-
-
-
 --echo '#----------------------FN_DYNVARS_001_06------------------------#'
 ######################################################################### 
 #     Check if the value in SESSION Table matches value in variable     #
diff --git a/mysql-test/suite/sys_vars/t/tmp_table_size_basic.test b/mysql-test/suite/sys_vars/t/tmp_table_size_basic.test
index c2ff51d50ca..116196ddb07 100644
--- a/mysql-test/suite/sys_vars/t/tmp_table_size_basic.test
+++ b/mysql-test/suite/sys_vars/t/tmp_table_size_basic.test
@@ -133,8 +133,9 @@ SELECT @@session.tmp_table_size;
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@session.tmp_table_size = "Test";
 
+--disable_warnings
 SET @@session.tmp_table_size = 12345678901;
-
+--enable_warnings
 # With a 64 bit mysqld:12345678901,with a 32 bit mysqld: 4294967295
 SELECT @@session.tmp_table_size IN (12345678901,4294967295);