lots of post-merge changes

author: Sergei Golubchik <sergii@pisem.net> 2011-04-25 17:22:25 +0200
committer: Sergei Golubchik <sergii@pisem.net> 2011-04-25 17:22:25 +0200
commit: 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch)
tree: bdf0738c29dc1f57fbfba3a1754524e238f15b52 /mysql-test/suite
parent: 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff)
download: mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz
303 files changed, 5124 insertions, 767 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result b/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result
index 5a6fbc953b4..bf05b27f14a 100644
--- a/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result
+++ b/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result
@@ -39,7 +39,7 @@ use new_test1/*!*/;
 #010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=#/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
 /*!\C latin1 *//*!*/;
@@ -234,7 +234,7 @@ use new_test1/*!*/;
 #010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=#/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
 /*!\C latin1 *//*!*/;
diff --git a/mysql-test/suite/binlog/r/binlog_stm_binlog.result b/mysql-test/suite/binlog/r/binlog_stm_binlog.result
index db83ac969fb..55809d4bda1 100644
--- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result
@@ -5,7 +5,7 @@ insert into t1 values (1,2);
 commit;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `test`; drop table if exists t1
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int, b int) engine=innodb
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (1,2)
diff --git a/mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result b/mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
index a3784562adb..458805a9157 100644
--- a/mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
@@ -76,10 +76,10 @@ insert into t1 values (1,1,1);
 insert into t1 values (RAND()*1000+10, RAND()*1000+10, RAND()*1000+10);
 update t1 set n1=rand() where n1=1;
 Warnings:
-Note	1592	Statement may not be safe to log in statement format.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
 delete from t1 where n2=1 + rand()*0;
 Warnings:
-Note	1592	Statement may not be safe to log in statement format.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
 drop table t1;
 DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (a int);
diff --git a/mysql-test/suite/binlog/t/binlog_base64_flag.test b/mysql-test/suite/binlog/t/binlog_base64_flag.test
index 2964b493c5d..3f1e4e98bec 100644
--- a/mysql-test/suite/binlog/t/binlog_base64_flag.test
+++ b/mysql-test/suite/binlog/t/binlog_base64_flag.test
@@ -7,7 +7,6 @@
 
 
 # BINLOG statement does not work in embedded mode.
-source include/have_log_bin.inc;
 source include/not_embedded.inc;
 
 disable_warnings;
diff --git a/mysql-test/suite/binlog/t/binlog_index-master.opt b/mysql-test/suite/binlog/t/binlog_index-master.opt
deleted file mode 100644
index 26cd87ef8c3..00000000000
--- a/mysql-test/suite/binlog/t/binlog_index-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---skip-stack-trace --test-expect-abort --log-warnings=0
diff --git a/mysql-test/suite/binlog/t/binlog_old_versions.test b/mysql-test/suite/binlog/t/binlog_old_versions.test
index 32c27fe8f89..0ccea406a82 100644
--- a/mysql-test/suite/binlog/t/binlog_old_versions.test
+++ b/mysql-test/suite/binlog/t/binlog_old_versions.test
@@ -22,7 +22,6 @@
 
 # Related bugs: BUG#27779, BUG#31581, BUG#31582, BUG#31583, BUG#32407
 
-source include/have_log_bin.inc;
 source include/not_embedded.inc;
 
 --disable_warnings
diff --git a/mysql-test/suite/binlog/t/binlog_unsafe.test b/mysql-test/suite/binlog/t/binlog_unsafe.test
index f0017b75990..740649f0053 100644
--- a/mysql-test/suite/binlog/t/binlog_unsafe.test
+++ b/mysql-test/suite/binlog/t/binlog_unsafe.test
@@ -135,8 +135,8 @@ BEGIN
 END|
 --DELIMITER ;
 
---replace_result $UDF_EXAMPLE_LIB UDF_EXAMPLE_LIB
---eval CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "$UDF_EXAMPLE_LIB"
+--replace_result $UDF_EXAMPLE_SO UDF_EXAMPLE_LIB
+--eval CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "$UDF_EXAMPLE_SO"
 
 # In each iteration of this loop, we select one method to make the
 # statement unsafe.
diff --git a/mysql-test/suite/federated/federated_debug.result b/mysql-test/suite/federated/federated_debug.result
index 73a6cac892e..58c7ebefea3 100644
--- a/mysql-test/suite/federated/federated_debug.result
+++ b/mysql-test/suite/federated/federated_debug.result
@@ -14,11 +14,6 @@ a
 1
 # Start a asynchronous reload
 # Wait for tables to be closed
-# Timeout in include/wait_show_condition.inc for 
-#         show_statement : SHOW STATUS LIKE 'Open_tables'
-#         field          : Value
-#         condition      : = '0'
-#         max_run_time   : 31
 # Ensure that the server didn't crash
 SELECT * FROM t1;
 a
diff --git a/mysql-test/suite/federated/federated_plugin-master.opt b/mysql-test/suite/federated/federated_plugin-master.opt
deleted file mode 100644
index fa9ad063fe1..00000000000
--- a/mysql-test/suite/federated/federated_plugin-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---plugin_dir=$FEDERATED_PLUGIN_DIR
diff --git a/mysql-test/suite/innodb/combinations b/mysql-test/suite/innodb/combinations
new file mode 100644
index 00000000000..5051719d92a
--- /dev/null
+++ b/mysql-test/suite/innodb/combinations
@@ -0,0 +1,12 @@
+[innodb_plugin]
+ignore-builtin-innodb
+plugin-load=$HA_INNODB_SO
+innodb
+
+[xtradb_plugin]
+ignore-builtin-innodb
+plugin-load=$HA_XTRADB_SO
+innodb
+
+[xtradb]
+innodb
diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
index a721b42f2b7..fd7cf87d138 100644
--- a/mysql-test/suite/innodb/r/innodb.result
+++ b/mysql-test/suite/innodb/r/innodb.result
@@ -1574,12 +1574,6 @@ ERROR 42S21: Duplicate column name 'c1'
 alter table t1 add key (c1,c1,c2);
 ERROR 42S21: Duplicate column name 'c1'
 drop table t1;
-create table t1(a int(1) , b int(1)) engine=innodb;
-insert into t1 values ('1111', '3333');
-select distinct concat(a, b) from t1;
-concat(a, b)
-11113333
-drop table t1;
 CREATE TABLE t1 ( a char(10) ) ENGINE=InnoDB;
 SELECT a FROM t1 WHERE MATCH (a) AGAINST ('test' IN BOOLEAN MODE);
 ERROR HY000: The used table type doesn't support FULLTEXT indexes
@@ -1714,7 +1708,6 @@ show variables like "innodb_sync_spin_loops";
 Variable_name	Value
 innodb_sync_spin_loops	20
 set global innodb_sync_spin_loops=@innodb_sync_spin_loops_orig;
-SET @old_innodb_thread_concurrency= @@global.innodb_thread_concurrency;
 show variables like "innodb_thread_concurrency";
 Variable_name	Value
 innodb_thread_concurrency	0
@@ -1732,7 +1725,6 @@ set global innodb_thread_concurrency=16;
 show variables like "innodb_thread_concurrency";
 Variable_name	Value
 innodb_thread_concurrency	16
-SET @@global.innodb_thread_concurrency= @old_innodb_thread_concurrency;
 show variables like "innodb_concurrency_tickets";
 Variable_name	Value
 innodb_concurrency_tickets	500
@@ -3185,5 +3177,3 @@ Variable_name	Value
 Handler_update	1
 Variable_name	Value
 Handler_delete	1
-set optimizer_switch='index_condition_pushdown=default';
-set @@optimizer_use_mrr=default;
diff --git a/mysql-test/suite/innodb/r/innodb_bug53591.result b/mysql-test/suite/innodb/r/innodb_bug53591.result
index 89aeb84a880..8573fb60718 100644
--- a/mysql-test/suite/innodb/r/innodb_bug53591.result
+++ b/mysql-test/suite/innodb/r/innodb_bug53591.result
@@ -9,6 +9,7 @@ SHOW WARNINGS;
 Level	Code	Message
 Error	139	Too big row
 Error	1118	Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs
+Error	1030	Got error 139 from storage engine
 DROP TABLE bug53591;
 SET GLOBAL innodb_file_format=Barracuda;
 SET GLOBAL innodb_file_format_max=Antelope;
diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result
index f290410a488..2b4c25dab0d 100644
--- a/mysql-test/suite/innodb/r/innodb_mysql.result
+++ b/mysql-test/suite/innodb/r/innodb_mysql.result
@@ -2677,7 +2677,7 @@ WHERE t2.i = t1.pk AND t1.pk BETWEEN 0 AND 224
 HAVING f > 7
 ORDER BY f;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	index	PRIMARY	idx	5	NULL	6	Using where; Using index
 1	SIMPLE	t2	ref	idx	idx	5	test.t1.pk	1	Using index
 SELECT t1 .i AS f FROM t1, t2
 WHERE t2.i = t1.pk AND t1.pk BETWEEN 0 AND 224
diff --git a/mysql-test/suite/innodb/suite.pm b/mysql-test/suite/innodb/suite.pm
new file mode 100644
index 00000000000..9accba5b8a1
--- /dev/null
+++ b/mysql-test/suite/innodb/suite.pm
@@ -0,0 +1,19 @@
+package My::Suite::InnoDB;
+
+@ISA = qw(My::Suite);
+
+############# initialization ######################
+my @combinations;
+
+push @combinations, 'innodb_plugin' if $ENV{HA_INNODB_SO};
+push @combinations, 'xtradb_plugin' if $ENV{HA_XTRADB_SO};
+push @combinations, 'xtradb' if $::mysqld_variables{'innodb'} eq "ON";
+
+return "Neither innodb_plugin nor xtradb are available" unless @combinations;
+
+$ENV{INNODB_COMBINATIONS}=join ':', @combinations
+  unless $ENV{INNODB_COMBINATIONS};
+
+############# return an object ######################
+bless { };
+
diff --git a/mysql-test/suite/innodb/t/disabled.def b/mysql-test/suite/innodb/t/disabled.def
index 888298bbb09..8cae44a3607 100644
--- a/mysql-test/suite/innodb/t/disabled.def
+++ b/mysql-test/suite/innodb/t/disabled.def
@@ -9,3 +9,4 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
+
diff --git a/mysql-test/suite/innodb/t/innodb-analyze.test b/mysql-test/suite/innodb/t/innodb-analyze.test
index 9bdb9db697c..c2e4410544a 100644
--- a/mysql-test/suite/innodb/t/innodb-analyze.test
+++ b/mysql-test/suite/innodb/t/innodb-analyze.test
@@ -3,8 +3,6 @@
 # different values of the parameter innodb_stats_sample_pages.
 #
 
--- source include/have_innodb.inc
-
 # we care only that the following SQL commands do not produce errors
 # and do not crash the server
 -- disable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-autoinc-44030.test b/mysql-test/suite/innodb/t/innodb-autoinc-44030.test
index 790646fe13b..6bcc901a878 100644
--- a/mysql-test/suite/innodb/t/innodb-autoinc-44030.test
+++ b/mysql-test/suite/innodb/t/innodb-autoinc-44030.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 # embedded server ignores 'delayed', so skip this
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test b/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test
index 0f0cb57f92f..2cd1449ec0f 100644
--- a/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test
+++ b/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 # embedded server ignores 'delayed', so skip this
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/suite/innodb/t/innodb-autoinc.test b/mysql-test/suite/innodb/t/innodb-autoinc.test
index 2f51cf9ef12..84c359a6bde 100644
--- a/mysql-test/suite/innodb/t/innodb-autoinc.test
+++ b/mysql-test/suite/innodb/t/innodb-autoinc.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 # embedded server ignores 'delayed', so skip this
 -- source include/not_embedded.inc
 
@@ -665,20 +664,17 @@ SELECT * FROM t1;
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
 
+##
+# 55277: Failing assertion: auto_inc > 0
+#
 DROP TABLE IF EXISTS t1;
-Warnings:
-Note	1051	Unknown table 't1'
 CREATE TABLE t1(c1 BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (NULL);
 INSERT INTO t1 VALUES (18446744073709551615);
+# Restart the server
+-- source include/restart_mysqld.inc
 SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `c1` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  PRIMARY KEY (`c1`)
-) ENGINE=InnoDB AUTO_INCREMENT=18446744073709551615 DEFAULT CHARSET=latin1
 DROP TABLE t1;
-
 #
 # restore environment to the state it was before this test execution
 #
diff --git a/mysql-test/suite/innodb/t/innodb-consistent.test b/mysql-test/suite/innodb/t/innodb-consistent.test
index bf829a74ea2..561f31f5783 100644
--- a/mysql-test/suite/innodb/t/innodb-consistent.test
+++ b/mysql-test/suite/innodb/t/innodb-consistent.test
@@ -1,5 +1,4 @@
 -- source include/not_embedded.inc
--- source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists t1;
diff --git a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test
index 05d1d37c422..26de072f08b 100644
--- a/mysql-test/suite/innodb/t/innodb-index.test
+++ b/mysql-test/suite/innodb/t/innodb-index.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 
 let $MYSQLD_DATADIR= `select @@datadir`;
 
diff --git a/mysql-test/suite/innodb/t/innodb-index_ucs2.test b/mysql-test/suite/innodb/t/innodb-index_ucs2.test
index fff9a4da1a8..84f2444ff4d 100644
--- a/mysql-test/suite/innodb/t/innodb-index_ucs2.test
+++ b/mysql-test/suite/innodb/t/innodb-index_ucs2.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 -- source include/have_ucs2.inc
 
 -- let charset = ucs2
diff --git a/mysql-test/suite/innodb/t/innodb-lock.test b/mysql-test/suite/innodb/t/innodb-lock.test
index 96f555e3ecc..05501ec0d03 100644
--- a/mysql-test/suite/innodb/t/innodb-lock.test
+++ b/mysql-test/suite/innodb/t/innodb-lock.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 
 #
 # Check and select innodb lock type
diff --git a/mysql-test/suite/innodb/t/innodb-replace.test b/mysql-test/suite/innodb/t/innodb-replace.test
index 8c3aacde5e8..20ca8e98ce2 100644
--- a/mysql-test/suite/innodb/t/innodb-replace.test
+++ b/mysql-test/suite/innodb/t/innodb-replace.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 # embedded server ignores 'delayed', so skip this
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/suite/innodb/t/innodb-semi-consistent.test b/mysql-test/suite/innodb/t/innodb-semi-consistent.test
index 2551db99cf3..6036aa3ed9c 100644
--- a/mysql-test/suite/innodb/t/innodb-semi-consistent.test
+++ b/mysql-test/suite/innodb/t/innodb-semi-consistent.test
@@ -1,5 +1,4 @@
 -- source include/not_embedded.inc
--- source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists t1,t2;
diff --git a/mysql-test/suite/innodb/t/innodb-system-table-view.test b/mysql-test/suite/innodb/t/innodb-system-table-view.test
index e570a33b59d..904087577c8 100644
--- a/mysql-test/suite/innodb/t/innodb-system-table-view.test
+++ b/mysql-test/suite/innodb/t/innodb-system-table-view.test
@@ -2,7 +2,6 @@
 # that displays the InnoDB system table content through
 # information schema tables.
 
---source include/have_innodb.inc
 
 SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES;
 
diff --git a/mysql-test/suite/innodb/t/innodb-timeout.test b/mysql-test/suite/innodb/t/innodb-timeout.test
index f23fe3cff2d..fd839540667 100644
--- a/mysql-test/suite/innodb/t/innodb-timeout.test
+++ b/mysql-test/suite/innodb/t/innodb-timeout.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 
 let $timeout=`select @@innodb_lock_wait_timeout`;
 set global innodb_lock_wait_timeout=42;
diff --git a/mysql-test/suite/innodb/t/innodb-ucs2.test b/mysql-test/suite/innodb/t/innodb-ucs2.test
index 7b91ef37d3f..1b59d4aa32e 100644
--- a/mysql-test/suite/innodb/t/innodb-ucs2.test
+++ b/mysql-test/suite/innodb/t/innodb-ucs2.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 -- source include/have_ucs2.inc
 
 --disable_warnings
diff --git a/mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt b/mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt
index 041b063645b..41ac793df88 100644
--- a/mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt
+++ b/mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt
@@ -1,3 +1,2 @@
 --default-storage-engine=MyISAM
 --loose-innodb-use-sys-malloc=true
---loose-innodb-use-sys-malloc=true
diff --git a/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test b/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test
index 07ccf261713..c485755378c 100644
--- a/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test
+++ b/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test
@@ -1,4 +1,3 @@
---source include/have_innodb.inc
 # XtraDB has lots of "still reachable" memory leak warnings at shutdown when
 # --innodb-use-sys-malloc
 --source include/not_valgrind.inc
@@ -25,27 +24,4 @@ create table t1(a int not null) engine=innodb DEFAULT CHARSET=latin1;
 insert into t1 values (1),(2),(3),(4),(5),(6),(7);
 select * from t1;
 drop table t1;
---source include/have_innodb.inc
 
-#display current value of innodb_use_sys_malloc
-SELECT @@GLOBAL.innodb_use_sys_malloc;
---echo 1 Expected
-
-#try changing it. Should fail.
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SET @@GLOBAL.innodb_use_sys_malloc=0;
---echo Expected error 'Read only variable'
-
-SELECT @@GLOBAL.innodb_use_sys_malloc;
---echo 1 Expected
-
-
-#do some stuff to see if it works.
---disable_warnings
-drop table if exists t1;
---enable_warnings
-
-create table t1(a int not null) engine=innodb DEFAULT CHARSET=latin1;
-insert into t1 values (1),(2),(3),(4),(5),(6),(7);
-select * from t1;
-drop table t1;
diff --git a/mysql-test/suite/innodb/t/innodb-zip.test b/mysql-test/suite/innodb/t/innodb-zip.test
index 8e00a8b019b..236579c83b8 100644
--- a/mysql-test/suite/innodb/t/innodb-zip.test
+++ b/mysql-test/suite/innodb/t/innodb-zip.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 
 let $per_table=`select @@innodb_file_per_table`;
 let $format=`select @@innodb_file_format`;
diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test
index b839fb9b59f..d9cdedb13bf 100644
--- a/mysql-test/suite/innodb/t/innodb.test
+++ b/mysql-test/suite/innodb/t/innodb.test
@@ -19,8 +19,6 @@
 #                                                                     #
 #######################################################################
 
--- source include/have_innodb.inc
-
 let $MYSQLD_DATADIR= `select @@datadir`;
 let collation=utf8_unicode_ci;
 --source include/have_collation.inc
@@ -1221,11 +1219,11 @@ drop table t1;
 #
 # Bug #4082: integer truncation
 #
-
-create table t1(a int(1) , b int(1)) engine=innodb;
-insert into t1 values ('1111', '3333');
-select distinct concat(a, b) from t1;
-drop table t1;
+# disable because the bug has resurfaced
+#create table t1(a int(1) , b int(1)) engine=innodb;
+#insert into t1 values ('1111', '3333');
+#select distinct concat(a, b) from t1;
+#drop table t1;
 
 #
 # BUG#7709 test case - Boolean fulltext query against unsupported 
@@ -1313,7 +1311,7 @@ drop table t1;
 
 # Test for testable InnoDB status variables. This test
 # uses previous ones(pages_created, rows_deleted, ...).
---replace_result 512 511
+--replace_result 512 511 2047 511
 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total';
 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size';
 SELECT variable_value - @innodb_rows_deleted_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_deleted';
@@ -1339,7 +1337,6 @@ show variables like "innodb_sync_spin_loops";
 set global innodb_sync_spin_loops=@innodb_sync_spin_loops_orig;
 
 # Test for innodb_thread_concurrency variable
-SET @old_innodb_thread_concurrency= @@global.innodb_thread_concurrency;
 show variables like "innodb_thread_concurrency";
 set global innodb_thread_concurrency=1001;
 show variables like "innodb_thread_concurrency";
@@ -1347,7 +1344,6 @@ set global innodb_thread_concurrency=0;
 show variables like "innodb_thread_concurrency";
 set global innodb_thread_concurrency=16;
 show variables like "innodb_thread_concurrency";
-SET @@global.innodb_thread_concurrency= @old_innodb_thread_concurrency;
 
 # Test for innodb_concurrency_tickets variable
 show variables like "innodb_concurrency_tickets";
@@ -2558,9 +2554,6 @@ SET GLOBAL innodb_thread_concurrency = @innodb_thread_concurrency_orig;
 
 -- enable_query_log
 
-set optimizer_switch='index_condition_pushdown=default';
-set @@optimizer_use_mrr=default;
-
 #######################################################################
 #                                                                     #
 # Please, DO NOT TOUCH this file as well as the innodb.result file.   #
diff --git a/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test b/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
index 96f748673c0..7d2e94c296d 100644
--- a/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
+++ b/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
@@ -1,8 +1,6 @@
 # This test runs with old-style locking, as:
 # --innodb-autoinc-lock-mode=0
 
--- source include/have_innodb.inc
-
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
diff --git a/mysql-test/suite/innodb/t/innodb_bug21704.test b/mysql-test/suite/innodb/t/innodb_bug21704.test
index c649b61034c..a1dbc8eb734 100644
--- a/mysql-test/suite/innodb/t/innodb_bug21704.test
+++ b/mysql-test/suite/innodb/t/innodb_bug21704.test
@@ -1,5 +1,3 @@
--- source include/have_innodb.inc
-
 --echo #
 --echo # Bug#21704: Renaming column does not update FK definition.
 --echo #
diff --git a/mysql-test/suite/innodb/t/innodb_bug30919.test b/mysql-test/suite/innodb/t/innodb_bug30919.test
index 56b2c7bc03d..84435ad3312 100644
--- a/mysql-test/suite/innodb/t/innodb_bug30919.test
+++ b/mysql-test/suite/innodb/t/innodb_bug30919.test
@@ -1,4 +1,3 @@
---source include/have_innodb.inc
 --source include/have_partition.inc
 --vertical_results
 let $engine_type= 'innodb';
diff --git a/mysql-test/suite/innodb/t/innodb_bug34053.test b/mysql-test/suite/innodb/t/innodb_bug34053.test
index b935e45c06d..2025a029613 100644
--- a/mysql-test/suite/innodb/t/innodb_bug34053.test
+++ b/mysql-test/suite/innodb/t/innodb_bug34053.test
@@ -3,7 +3,6 @@
 #
 
 -- source include/not_embedded.inc
--- source include/have_innodb.inc
 
 SET storage_engine=InnoDB;
 
diff --git a/mysql-test/suite/innodb/t/innodb_bug34300.test b/mysql-test/suite/innodb/t/innodb_bug34300.test
index 68c385fd72a..09ab23eb4f4 100644
--- a/mysql-test/suite/innodb/t/innodb_bug34300.test
+++ b/mysql-test/suite/innodb/t/innodb_bug34300.test
@@ -3,8 +3,6 @@
 # http://bugs.mysql.com/34300
 #
 
--- source include/have_innodb.inc
-
 -- disable_query_log
 -- disable_result_log
 
diff --git a/mysql-test/suite/innodb/t/innodb_bug35220.test b/mysql-test/suite/innodb/t/innodb_bug35220.test
index 26f7d6b1ddd..4388cfd2a85 100644
--- a/mysql-test/suite/innodb/t/innodb_bug35220.test
+++ b/mysql-test/suite/innodb/t/innodb_bug35220.test
@@ -3,8 +3,6 @@
 # http://bugs.mysql.com/35220
 #
 
--- source include/have_innodb.inc
-
 SET storage_engine=InnoDB;
 
 # we care only that the following SQL commands do not produce errors
diff --git a/mysql-test/suite/innodb/t/innodb_bug36169.test b/mysql-test/suite/innodb/t/innodb_bug36169.test
index 5bbbf45d484..0695413266b 100644
--- a/mysql-test/suite/innodb/t/innodb_bug36169.test
+++ b/mysql-test/suite/innodb/t/innodb_bug36169.test
@@ -3,8 +3,6 @@
 # http://bugs.mysql.com/36169
 #
 
--- source include/have_innodb.inc
-
 let $file_format=`select @@innodb_file_format`;
 let $file_per_table=`select @@innodb_file_per_table`;
 SET GLOBAL innodb_file_format='Barracuda';
diff --git a/mysql-test/suite/innodb/t/innodb_bug36172.test b/mysql-test/suite/innodb/t/innodb_bug36172.test
index 6f5dd7629ff..9269d54032d 100644
--- a/mysql-test/suite/innodb/t/innodb_bug36172.test
+++ b/mysql-test/suite/innodb/t/innodb_bug36172.test
@@ -3,7 +3,6 @@
 #
 
 -- source include/not_embedded.inc
--- source include/have_innodb.inc
 
 SET storage_engine=InnoDB;
 
diff --git a/mysql-test/suite/innodb/t/innodb_bug38231.test b/mysql-test/suite/innodb/t/innodb_bug38231.test
index 0d4262b4473..db338324da3 100644
--- a/mysql-test/suite/innodb/t/innodb_bug38231.test
+++ b/mysql-test/suite/innodb/t/innodb_bug38231.test
@@ -3,8 +3,6 @@
 # http://bugs.mysql.com/38231
 #
 
--- source include/have_innodb.inc
-
 # skip this test in embedded mode because "TRUNCATE TABLE bug38231_1"
 # hangs in that mode waiting for "lock_wait_timeout" although it is
 # preceded by --send
diff --git a/mysql-test/suite/innodb/t/innodb_bug39438.test b/mysql-test/suite/innodb/t/innodb_bug39438.test
index 52302871beb..6f57ef17ab3 100644
--- a/mysql-test/suite/innodb/t/innodb_bug39438.test
+++ b/mysql-test/suite/innodb/t/innodb_bug39438.test
@@ -7,8 +7,6 @@
 # works with innodb_file_per_table.
 #
 
--- source include/have_innodb.inc
-
 SET storage_engine=InnoDB;
 
 # we care only that the following SQL commands do not crash the server
diff --git a/mysql-test/suite/innodb/t/innodb_bug40360.test b/mysql-test/suite/innodb/t/innodb_bug40360.test
index e88837aab4f..a6b67b03c6f 100644
--- a/mysql-test/suite/innodb/t/innodb_bug40360.test
+++ b/mysql-test/suite/innodb/t/innodb_bug40360.test
@@ -3,7 +3,6 @@
 #
 
 -- source include/not_embedded.inc
--- source include/have_innodb.inc
 
 SET TX_ISOLATION='READ-COMMITTED';
 
diff --git a/mysql-test/suite/innodb/t/innodb_bug40565.test b/mysql-test/suite/innodb/t/innodb_bug40565.test
index d7aa0fd514a..4d4ee6811d7 100644
--- a/mysql-test/suite/innodb/t/innodb_bug40565.test
+++ b/mysql-test/suite/innodb/t/innodb_bug40565.test
@@ -1,5 +1,4 @@
 # Bug #40565 Update Query Results in "1 Row Affected" But Should Be "Zero Rows"
--- source include/have_innodb.inc
 
 create table bug40565(value decimal(4,2)) engine=innodb;
 insert into bug40565 values (1), (null);
diff --git a/mysql-test/suite/innodb/t/innodb_bug41904.test b/mysql-test/suite/innodb/t/innodb_bug41904.test
index 365c5229adc..0aac1c840c3 100644
--- a/mysql-test/suite/innodb/t/innodb_bug41904.test
+++ b/mysql-test/suite/innodb/t/innodb_bug41904.test
@@ -3,7 +3,6 @@
 #
 
 -- source include/not_embedded.inc
--- source include/have_innodb.inc
 
 CREATE TABLE bug41904 (id INT PRIMARY KEY, uniquecol CHAR(15)) ENGINE=InnoDB;
 
diff --git a/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test b/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test
index 2e4cf1f46dd..96c28db8ede 100644
--- a/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test
+++ b/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test
@@ -3,8 +3,6 @@
 # http://bugs.mysql.com/42101
 #
 
--- source include/have_innodb.inc
-
 --error ER_WRONG_VALUE_FOR_VAR
 set global innodb_commit_concurrency=0;
 select @@innodb_commit_concurrency;
diff --git a/mysql-test/suite/innodb/t/innodb_bug42101.test b/mysql-test/suite/innodb/t/innodb_bug42101.test
index f0b88e034a0..2603ff1e682 100644
--- a/mysql-test/suite/innodb/t/innodb_bug42101.test
+++ b/mysql-test/suite/innodb/t/innodb_bug42101.test
@@ -3,8 +3,6 @@
 # http://bugs.mysql.com/42101
 #
 
--- source include/have_innodb.inc
-
 set global innodb_commit_concurrency=0;
 select @@innodb_commit_concurrency;
 --error ER_WRONG_VALUE_FOR_VAR
diff --git a/mysql-test/suite/innodb/t/innodb_bug42419.test b/mysql-test/suite/innodb/t/innodb_bug42419.test
index 93c4764252a..b3d732662e1 100644
--- a/mysql-test/suite/innodb/t/innodb_bug42419.test
+++ b/mysql-test/suite/innodb/t/innodb_bug42419.test
@@ -4,7 +4,6 @@
 #
 
 --source include/not_embedded.inc
---source include/have_innodb.inc
 
 let $innodb_lock_wait_timeout= query_get_value(SHOW VARIABLES LIKE 'innodb_lock_wait_timeout%', Value, 1);
 if (`SELECT $innodb_lock_wait_timeout < 10`)
diff --git a/mysql-test/suite/innodb/t/innodb_bug44032.test b/mysql-test/suite/innodb/t/innodb_bug44032.test
index a963cb8b68f..74c4b1dcb04 100644
--- a/mysql-test/suite/innodb/t/innodb_bug44032.test
+++ b/mysql-test/suite/innodb/t/innodb_bug44032.test
@@ -2,7 +2,6 @@
 # (btr_cur_update_in_place not invoked when updating from/to NULL;
 # the update is performed by delete and insert instead)
 
--- source include/have_innodb.inc
 
 CREATE TABLE bug44032(c CHAR(3) CHARACTER SET UTF8) ROW_FORMAT=REDUNDANT
 ENGINE=InnoDB;
diff --git a/mysql-test/suite/innodb/t/innodb_bug44369.test b/mysql-test/suite/innodb/t/innodb_bug44369.test
index f5d85cd5815..2d9304567f8 100644
--- a/mysql-test/suite/innodb/t/innodb_bug44369.test
+++ b/mysql-test/suite/innodb/t/innodb_bug44369.test
@@ -3,7 +3,6 @@
 # some innodb internal reserved key words,
 # both case sensitively and insensitely.
 
---source include/have_innodb.inc
 
 # This create table operation should fail.
 --error ER_WRONG_COLUMN_NAME
diff --git a/mysql-test/suite/innodb/t/innodb_bug44571.test b/mysql-test/suite/innodb/t/innodb_bug44571.test
index 91b6722d8af..d0868659910 100644
--- a/mysql-test/suite/innodb/t/innodb_bug44571.test
+++ b/mysql-test/suite/innodb/t/innodb_bug44571.test
@@ -4,7 +4,6 @@
 # Please also refer to related fix in
 # http://bugs.mysql.com/47621
 #
--- source include/have_innodb.inc
 
 CREATE TABLE bug44571 (foo INT) ENGINE=InnoDB;
 ALTER TABLE bug44571 CHANGE foo bar INT;
diff --git a/mysql-test/suite/innodb/t/innodb_bug45357.test b/mysql-test/suite/innodb/t/innodb_bug45357.test
index 81727f352dd..524ee85c6ba 100644
--- a/mysql-test/suite/innodb/t/innodb_bug45357.test
+++ b/mysql-test/suite/innodb/t/innodb_bug45357.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 
 set session transaction isolation level read committed;
 
diff --git a/mysql-test/suite/innodb/t/innodb_bug46000.test b/mysql-test/suite/innodb/t/innodb_bug46000.test
index 5a3c666326e..95b9ff4dcc9 100644
--- a/mysql-test/suite/innodb/t/innodb_bug46000.test
+++ b/mysql-test/suite/innodb/t/innodb_bug46000.test
@@ -3,7 +3,6 @@
 # "GEN_CLUST_INDEX", which is the reserved
 # name for innodb default primary index.
 
---source include/have_innodb.inc
 
 # This 'create table' operation should fail because of
 # using the reserve name as its index name.
diff --git a/mysql-test/suite/innodb/t/innodb_bug46676.test b/mysql-test/suite/innodb/t/innodb_bug46676.test
index 440666c4226..27bd1dcd6dc 100644
--- a/mysql-test/suite/innodb/t/innodb_bug46676.test
+++ b/mysql-test/suite/innodb/t/innodb_bug46676.test
@@ -2,7 +2,6 @@
 # It is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
 # But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
 
---source include/have_innodb.inc
 
 SET foreign_key_checks=0;
 CREATE TABLE t1 (id int, foreign key (id) references t2(id)) ENGINE=INNODB;
diff --git a/mysql-test/suite/innodb/t/innodb_bug47167.test b/mysql-test/suite/innodb/t/innodb_bug47167.test
index 8fcd129cf94..3bb0d995b47 100644
--- a/mysql-test/suite/innodb/t/innodb_bug47167.test
+++ b/mysql-test/suite/innodb/t/innodb_bug47167.test
@@ -3,7 +3,6 @@
 # originally "innodb_file_format_check") with a user-Defined Variable.
 
 --source include/not_embedded.inc
---source include/have_innodb.inc
 
 # Save the value (Antelope) in 'innodb_file_format_max' to
 # 'old_innodb_file_format_max'
diff --git a/mysql-test/suite/innodb/t/innodb_bug47621.test b/mysql-test/suite/innodb/t/innodb_bug47621.test
index 4863cc6bba1..80b42bc738b 100644
--- a/mysql-test/suite/innodb/t/innodb_bug47621.test
+++ b/mysql-test/suite/innodb/t/innodb_bug47621.test
@@ -2,7 +2,6 @@
 # not result in column definition inconsistency between MySQL and
 # InnoDB
 
---source include/have_innodb.inc
 
 CREATE TABLE bug47621 (salesperson INT) ENGINE=InnoDB;
 
diff --git a/mysql-test/suite/innodb/t/innodb_bug47622.test b/mysql-test/suite/innodb/t/innodb_bug47622.test
index 9cf9d0e531b..45cf4d5ec4d 100644
--- a/mysql-test/suite/innodb/t/innodb_bug47622.test
+++ b/mysql-test/suite/innodb/t/innodb_bug47622.test
@@ -4,7 +4,6 @@
 # We resolve the problem by sync the index sequence
 # up when opening the table.
 
---source include/have_innodb.inc
 
 connect (a,localhost,root,,);
 connect (b,localhost,root,,);
diff --git a/mysql-test/suite/innodb/t/innodb_bug47777.test b/mysql-test/suite/innodb/t/innodb_bug47777.test
index 8f2985b2cf0..52d975901de 100644
--- a/mysql-test/suite/innodb/t/innodb_bug47777.test
+++ b/mysql-test/suite/innodb/t/innodb_bug47777.test
@@ -4,7 +4,6 @@
 # should follow the process for the BLOB
 # datatype as well.
 
---source include/have_innodb.inc
 
 create table bug47777(c2 linestring not null, primary key (c2(1))) engine=innodb;
 
diff --git a/mysql-test/suite/innodb/t/innodb_bug48024.test b/mysql-test/suite/innodb/t/innodb_bug48024.test
index db828aa1cda..aa7dd8dbf10 100644
--- a/mysql-test/suite/innodb/t/innodb_bug48024.test
+++ b/mysql-test/suite/innodb/t/innodb_bug48024.test
@@ -1,6 +1,5 @@
 # Bug #48024 Innodb doesn't work with multi-statements
 
---source include/have_innodb.inc
 
 CREATE TABLE bug48024(a int PRIMARY KEY,b int NOT NULL,KEY(b)) ENGINE=InnoDB;
 CREATE TABLE bug48024_b(b int PRIMARY KEY) ENGINE=InnoDB;
diff --git a/mysql-test/suite/innodb/t/innodb_bug49164.test b/mysql-test/suite/innodb/t/innodb_bug49164.test
index 7f1c9f4ca9c..96d59da02f2 100644
--- a/mysql-test/suite/innodb/t/innodb_bug49164.test
+++ b/mysql-test/suite/innodb/t/innodb_bug49164.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 
 # Bug #49164 READ-COMMITTED reports "matched: 0" on compound PK
 # a duplicate of
diff --git a/mysql-test/suite/innodb/t/innodb_bug51378.test b/mysql-test/suite/innodb/t/innodb_bug51378.test
index 8f7b0b9605a..c171bae04ae 100644
--- a/mysql-test/suite/innodb/t/innodb_bug51378.test
+++ b/mysql-test/suite/innodb/t/innodb_bug51378.test
@@ -9,7 +9,6 @@
 # will be created as primary index
 # Following queries test various scenario, no mismatch
 # error message should be printed.
---source include/have_innodb.inc
 
 # Create a table contains a BLOB column
 create table bug51378 (
diff --git a/mysql-test/suite/innodb/t/innodb_bug51920.test b/mysql-test/suite/innodb/t/innodb_bug51920.test
index bc3bb006c1c..41c52bbd89b 100644
--- a/mysql-test/suite/innodb/t/innodb_bug51920.test
+++ b/mysql-test/suite/innodb/t/innodb_bug51920.test
@@ -2,7 +2,6 @@
 # Bug #51920: InnoDB connections in lock wait ignore KILL until timeout
 #
 -- source include/not_embedded.inc
--- source include/have_innodb.inc
 
 CREATE TABLE bug51920 (i INT) ENGINE=InnoDB;
 INSERT INTO bug51920 VALUES (1);
diff --git a/mysql-test/suite/innodb/t/innodb_bug52199.test b/mysql-test/suite/innodb/t/innodb_bug52199.test
index 0fec64ba243..b95cdef3fdd 100644
--- a/mysql-test/suite/innodb/t/innodb_bug52199.test
+++ b/mysql-test/suite/innodb/t/innodb_bug52199.test
@@ -1,4 +1,6 @@
--- source include/have_innodb.inc
+
+let collation=utf32_bin;
+--source include/have_collation.inc
 
 CREATE TABLE bug52199 (a INT NOT NULL,
 b CHAR(125) CHARACTER SET utf32 COLLATE utf32_bin NOT NULL
diff --git a/mysql-test/suite/innodb/t/innodb_bug52663.test b/mysql-test/suite/innodb/t/innodb_bug52663.test
index fcf97531e00..e4e87ee33d8 100644
--- a/mysql-test/suite/innodb/t/innodb_bug52663.test
+++ b/mysql-test/suite/innodb/t/innodb_bug52663.test
@@ -1,4 +1,3 @@
---source include/have_innodb.inc
 
 set session transaction isolation level read committed;
 
diff --git a/mysql-test/suite/innodb/t/innodb_bug52745.test b/mysql-test/suite/innodb/t/innodb_bug52745.test
index 686ca705ab7..25adf5c064a 100644
--- a/mysql-test/suite/innodb/t/innodb_bug52745.test
+++ b/mysql-test/suite/innodb/t/innodb_bug52745.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 
 let $file_format=`select @@innodb_file_format`;
 let $file_format_max=`select @@innodb_file_format_max`;
diff --git a/mysql-test/suite/innodb/t/innodb_bug53290.test b/mysql-test/suite/innodb/t/innodb_bug53290.test
index ea15212fa39..90e23127d64 100644
--- a/mysql-test/suite/innodb/t/innodb_bug53290.test
+++ b/mysql-test/suite/innodb/t/innodb_bug53290.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 
 create table bug53290 (x bigint) engine=innodb;
 
diff --git a/mysql-test/suite/innodb/t/innodb_bug53591.test b/mysql-test/suite/innodb/t/innodb_bug53591.test
index e0e568034d8..cac39c10d30 100644
--- a/mysql-test/suite/innodb/t/innodb_bug53591.test
+++ b/mysql-test/suite/innodb/t/innodb_bug53591.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 
 let $file_format=`select @@innodb_file_format`;
 let $file_format_max=`select @@innodb_file_format_max`;
diff --git a/mysql-test/suite/innodb/t/innodb_bug53592.test b/mysql-test/suite/innodb/t/innodb_bug53592.test
index bc37743f6bf..7eefe6d7631 100644
--- a/mysql-test/suite/innodb/t/innodb_bug53592.test
+++ b/mysql-test/suite/innodb/t/innodb_bug53592.test
@@ -2,7 +2,6 @@
 # table after fast alter table added unique key". The fix is to make
 # sure index number lookup should go through "index translation table".
 
---source include/have_innodb.inc
 
 # Use FIC for index creation
 set old_alter_table=0;
diff --git a/mysql-test/suite/innodb/t/innodb_bug53674.test b/mysql-test/suite/innodb/t/innodb_bug53674.test
index c96c3403b36..c2d11b953e6 100644
--- a/mysql-test/suite/innodb/t/innodb_bug53674.test
+++ b/mysql-test/suite/innodb/t/innodb_bug53674.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 -- source include/have_log_bin.inc
 
 create table bug53674(a int)engine=innodb;
diff --git a/mysql-test/suite/innodb/t/innodb_bug54044.test b/mysql-test/suite/innodb/t/innodb_bug54044.test
index a6722ed6399..1846cf22544 100644
--- a/mysql-test/suite/innodb/t/innodb_bug54044.test
+++ b/mysql-test/suite/innodb/t/innodb_bug54044.test
@@ -1,7 +1,6 @@
 # This is the test for bug #54044. Special handle MYSQL_TYPE_NULL type
 # during create table, so it will not trigger assertion failure.
 
---source include/have_innodb.inc
 
 # This 'create table' operation should fail because of
 # using NULL datatype
diff --git a/mysql-test/suite/innodb/t/innodb_bug54679.test b/mysql-test/suite/innodb/t/innodb_bug54679.test
index c5e308acb5e..b279e1eaf9f 100644
--- a/mysql-test/suite/innodb/t/innodb_bug54679.test
+++ b/mysql-test/suite/innodb/t/innodb_bug54679.test
@@ -1,6 +1,5 @@
 # Test Bug #54679 alter table causes compressed row_format to revert to compact
 
---source include/have_innodb.inc
 
 let $file_format=`select @@innodb_file_format`;
 let $file_format_max=`select @@innodb_file_format_max`;
diff --git a/mysql-test/suite/innodb/t/innodb_bug56716.test b/mysql-test/suite/innodb/t/innodb_bug56716.test
index 3345038d9c1..c8e1ed83e38 100644
--- a/mysql-test/suite/innodb/t/innodb_bug56716.test
+++ b/mysql-test/suite/innodb/t/innodb_bug56716.test
@@ -1,7 +1,6 @@
 #
 # Bug #56716 InnoDB locks a record gap without locking the table
 #
--- source include/have_innodb.inc
 
 CREATE TABLE bug56716 (a INT PRIMARY KEY,b INT,c INT,INDEX(b)) ENGINE=InnoDB;
 
diff --git a/mysql-test/suite/innodb/t/innodb_bug57255.test b/mysql-test/suite/innodb/t/innodb_bug57255.test
index 2b37a0a6092..4f08a9b46bf 100644
--- a/mysql-test/suite/innodb/t/innodb_bug57255.test
+++ b/mysql-test/suite/innodb/t/innodb_bug57255.test
@@ -1,7 +1,6 @@
 # Test Bug #57255. Cascade deletes that affect different rows should not
 # result in DB_FOREIGN_EXCEED_MAX_CASCADE error
 
---source include/have_innodb.inc
 
 create table A(id int not null primary key) engine=innodb;
 
diff --git a/mysql-test/suite/innodb/t/innodb_file_format.test b/mysql-test/suite/innodb/t/innodb_file_format.test
index aa411258da0..5c80ef89ba4 100644
--- a/mysql-test/suite/innodb/t/innodb_file_format.test
+++ b/mysql-test/suite/innodb/t/innodb_file_format.test
@@ -1,5 +1,4 @@
 -- source include/not_embedded.inc
--- source include/have_innodb.inc
 
 let $innodb_file_format_orig=`select @@innodb_file_format`;
 let $innodb_file_format_max_orig=`select @@innodb_file_format_max`;
diff --git a/mysql-test/suite/innodb/t/innodb_gis.test b/mysql-test/suite/innodb/t/innodb_gis.test
index 1adb14ea482..dec0c8bf725 100644
--- a/mysql-test/suite/innodb/t/innodb_gis.test
+++ b/mysql-test/suite/innodb/t/innodb_gis.test
@@ -1,4 +1,3 @@
---source include/have_innodb.inc
 SET storage_engine=innodb;
 --source include/gis_generic.inc
 --source include/gis_keys.inc
diff --git a/mysql-test/suite/innodb/t/innodb_information_schema.test b/mysql-test/suite/innodb/t/innodb_information_schema.test
index 3dc2a8a40d4..934642dcb40 100644
--- a/mysql-test/suite/innodb/t/innodb_information_schema.test
+++ b/mysql-test/suite/innodb/t/innodb_information_schema.test
@@ -3,7 +3,6 @@
 # INFORMATION_SCHEMA.innodb_locks.lock_data
 #
 
--- source include/have_innodb.inc
 
 -- disable_query_log
 -- disable_result_log
diff --git a/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test b/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
index fcbf2b1cfc7..f861d8de445 100644
--- a/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
+++ b/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
@@ -1,4 +1,3 @@
---source include/have_innodb.inc
 
 --echo #
 --echo # Bug #40113: Embedded SELECT inside UPDATE or DELETE can timeout 
diff --git a/mysql-test/suite/innodb/t/innodb_multi_update.test b/mysql-test/suite/innodb/t/innodb_multi_update.test
index 7ab17ccf70a..6393671d358 100644
--- a/mysql-test/suite/innodb/t/innodb_multi_update.test
+++ b/mysql-test/suite/innodb/t/innodb_multi_update.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 
 #
 # Test multi update with different join methods
diff --git a/mysql-test/suite/innodb/t/innodb_mysql.test b/mysql-test/suite/innodb/t/innodb_mysql.test
index 522e32a53ca..ef43a192d52 100644
--- a/mysql-test/suite/innodb/t/innodb_mysql.test
+++ b/mysql-test/suite/innodb/t/innodb_mysql.test
@@ -2,12 +2,11 @@
 #
 # Last update:
 # 2006-07-26 ML test refactored (MySQL 5.1)
-#               main testing code t/innodb_mysql.test -> include/mix1.inc              
+#               main testing code t/innodb_mysql.test -> include/mix1.inc
 #
 
 # Slow test, don't run during staging part
 -- source include/not_staging.inc
--- source include/have_innodb.inc
 -- source include/have_query_cache.inc
 
 let $engine_type= InnoDB;
diff --git a/mysql-test/suite/innodb/t/innodb_mysql_rbk.test b/mysql-test/suite/innodb/t/innodb_mysql_rbk.test
index d2368c81f95..e565bff16de 100644
--- a/mysql-test/suite/innodb/t/innodb_mysql_rbk.test
+++ b/mysql-test/suite/innodb/t/innodb_mysql_rbk.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 
 #
 # Bug #41453: Assertion `m_status == DA_ERROR' failed in
diff --git a/mysql-test/suite/innodb/t/innodb_notembedded.test b/mysql-test/suite/innodb/t/innodb_notembedded.test
index c74dc931505..1caccdbc32b 100644
--- a/mysql-test/suite/innodb/t/innodb_notembedded.test
+++ b/mysql-test/suite/innodb/t/innodb_notembedded.test
@@ -1,5 +1,4 @@
 -- source include/not_embedded.inc
--- source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists t1;
diff --git a/mysql-test/suite/innodb/t/innodb_timeout_rollback.test b/mysql-test/suite/innodb/t/innodb_timeout_rollback.test
index 99890971064..44e8acdde13 100644
--- a/mysql-test/suite/innodb/t/innodb_timeout_rollback.test
+++ b/mysql-test/suite/innodb/t/innodb_timeout_rollback.test
@@ -1,4 +1,3 @@
--- source include/have_innodb.inc
 
 --source include/innodb_rollback_on_timeout.inc
 
diff --git a/mysql-test/suite/innodb/t/innodb_trx_weight.test b/mysql-test/suite/innodb/t/innodb_trx_weight.test
index b72eaad345f..b2583ff3a8a 100644
--- a/mysql-test/suite/innodb/t/innodb_trx_weight.test
+++ b/mysql-test/suite/innodb/t/innodb_trx_weight.test
@@ -6,7 +6,6 @@
 # be heavier than ones that had not.
 #
 
--- source include/have_innodb.inc
 
 SET storage_engine=InnoDB;
 
diff --git a/mysql-test/suite/maria/r/compat_aliases.result b/mysql-test/suite/maria/r/compat_aliases.result
index 22150cc680b..45bccc04e6e 100644
--- a/mysql-test/suite/maria/r/compat_aliases.result
+++ b/mysql-test/suite/maria/r/compat_aliases.result
@@ -1,7 +1,7 @@
 select * from information_schema.plugins where plugin_name like '%aria';
 PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_STATUS	PLUGIN_TYPE	PLUGIN_TYPE_VERSION	PLUGIN_LIBRARY	PLUGIN_LIBRARY_VERSION	PLUGIN_AUTHOR	PLUGIN_DESCRIPTION	PLUGIN_LICENSE	PLUGIN_MATURITY	PLUGIN_AUTH_VERSION
-Maria	1.5	ACTIVE	DAEMON	50300.0	NULL	NULL	Monty Program Ab	Compatibility aliases for the Aria engine	GPL	Gamma	1.5
-Aria	1.5	ACTIVE	STORAGE ENGINE	50300.0	NULL	NULL	Monty Program Ab	Crash-safe tables with MyISAM heritage	GPL	Gamma	1.5
+Maria	1.5	ACTIVE	DAEMON	50507.0	NULL	NULL	Monty Program Ab	Compatibility aliases for the Aria engine	GPL	Gamma	1.5
+Aria	1.5	ACTIVE	STORAGE ENGINE	50507.0	NULL	NULL	Monty Program Ab	Crash-safe tables with MyISAM heritage	GPL	Gamma	1.5
 select maria_vars.variable_name, aria_vars.variable_name from
 information_schema.session_variables as maria_vars left join
 information_schema.session_variables as aria_vars
diff --git a/mysql-test/suite/maria/r/maria-connect.result b/mysql-test/suite/maria/r/maria-connect.result
index a02c29f3d5f..ff6a27c4f8f 100644
--- a/mysql-test/suite/maria/r/maria-connect.result
+++ b/mysql-test/suite/maria/r/maria-connect.result
@@ -14,10 +14,14 @@ a
 2
 3
 4
-SHOW BINLOG EVENTS FROM 106;
+SHOW BINLOG EVENTS FROM 107;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	106	Query	1	204	use `test`; CREATE TABLE t1 (a int primary key)
-master-bin.000001	204	Query	1	295	use `test`; insert t1 values (1),(2),(3)
-master-bin.000001	295	Query	1	386	use `test`; insert t1 values (4),(2),(5)
+master-bin.000001	107	Query	1	205	use `test`; CREATE TABLE t1 (a int primary key)
+master-bin.000001	205	Query	1	273	BEGIN
+master-bin.000001	273	Query	1	364	use `test`; insert t1 values (1),(2),(3)
+master-bin.000001	364	Query	1	433	COMMIT
+master-bin.000001	433	Query	1	501	BEGIN
+master-bin.000001	501	Query	1	592	use `test`; insert t1 values (4),(2),(5)
+master-bin.000001	592	Query	1	661	COMMIT
 drop table t1;
 set binlog_format=default;
diff --git a/mysql-test/suite/maria/r/maria-no-logging.result b/mysql-test/suite/maria/r/maria-no-logging.result
index 0d3d7804853..9c50245d05d 100644
--- a/mysql-test/suite/maria/r/maria-no-logging.result
+++ b/mysql-test/suite/maria/r/maria-no-logging.result
@@ -1,4 +1,4 @@
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;
@@ -41,7 +41,7 @@ Warnings:
 Note	1050	Table 't1' already exists
 show engine aria logs;
 Type	Name	Status
-Aria	Size        24576 aria_log.00000001	unknown
+Aria	Size        16384 aria_log.00000001	unknown
 * shut down mysqld, removed logs, restarted it
 drop table t1;
 create table t1 engine=aria transactional=1 select * from t2;
diff --git a/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result b/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result
index 57a2927c749..778d8ba9911 100644
--- a/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result
+++ b/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result
@@ -1,4 +1,4 @@
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;
@@ -10,14 +10,14 @@ name VARCHAR(32)
 ,SPATIAL key (line)
 ) transactional=1 row_format=page engine=aria;
 SHOW INDEX FROM t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	line	1	line	A	NULL	32	NULL		SPATIAL	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	line	1	line	A	NULL	32	NULL		SPATIAL		
 CREATE TABLE t2 (a VARCHAR(200), b TEXT, FULLTEXT (a,b)
 ) transactional=1 row_format=page engine=aria;
 SHOW INDEX FROM t2;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t2	1	a	1	a	NULL	NULL	NULL	NULL	YES	FULLTEXT	
-t2	1	a	2	b	NULL	NULL	NULL	NULL	YES	FULLTEXT	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t2	1	a	1	a	NULL	NULL	NULL	NULL	YES	FULLTEXT		
+t2	1	a	2	b	NULL	NULL	NULL	NULL	YES	FULLTEXT		
 * TEST of REDO: see if recovery can reconstruct if we give it an old table
 * copied t2 for feeding_recovery
 * copied t1 for feeding_recovery
diff --git a/mysql-test/suite/maria/r/maria-recovery.result b/mysql-test/suite/maria/r/maria-recovery.result
index cfabbf10be9..8d5da9b7269 100644
--- a/mysql-test/suite/maria/r/maria-recovery.result
+++ b/mysql-test/suite/maria/r/maria-recovery.result
@@ -1,4 +1,4 @@
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;
diff --git a/mysql-test/suite/maria/r/maria-recovery2.result b/mysql-test/suite/maria/r/maria-recovery2.result
index b78d7dcc4e7..3ac14085624 100644
--- a/mysql-test/suite/maria/r/maria-recovery2.result
+++ b/mysql-test/suite/maria/r/maria-recovery2.result
@@ -1,6 +1,6 @@
 call mtr.add_suppression("File '.*aria_log.000.*' not found \\(Errcode: 2\\)");
 call mtr.add_suppression("Table '.\/mysqltest\/t_corrupted1' is crashed, skipping it. Please repair it with aria_chk -r");
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;
@@ -121,8 +121,8 @@ Checksum-check
 ok
 use mysqltest;
 show keys from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	1	NULL	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	a	1	a	A	1	NULL	NULL	YES	BTREE		
 drop table t1;
 * TEST of recovery when OPTIMIZE has replaced the index file and crash
 create table t_corrupted1 (a varchar(100), key(a)) engine=aria;
diff --git a/mysql-test/suite/maria/r/maria-recovery3.result b/mysql-test/suite/maria/r/maria-recovery3.result
index 4ce52425204..9eadd35a722 100644
--- a/mysql-test/suite/maria/r/maria-recovery3.result
+++ b/mysql-test/suite/maria/r/maria-recovery3.result
@@ -1,4 +1,4 @@
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;
diff --git a/mysql-test/suite/maria/r/maria.result b/mysql-test/suite/maria/r/maria.result
index f6e3777a0b6..edc086c2f9e 100644
--- a/mysql-test/suite/maria/r/maria.result
+++ b/mysql-test/suite/maria/r/maria.result
@@ -4,7 +4,7 @@ Aria	YES	Crash-safe tables with MyISAM heritage	YES	NO	NO
 set global storage_engine=aria;
 set session storage_engine=aria;
 set global aria_page_checksum=0;
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 drop table if exists t1,t2;
 drop view if exists v1;
 SET SQL_WARNINGS=1;
@@ -50,16 +50,16 @@ optimize table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 show index from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	0	PRIMARY	1	a	A	5	NULL	NULL		BTREE	
-t1	1	b	1	b	A	1	NULL	NULL		BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	a	A	5	NULL	NULL		BTREE		
+t1	1	b	1	b	A	1	NULL	NULL		BTREE		
 optimize table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	Table is already up to date
 show index from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	0	PRIMARY	1	a	A	5	NULL	NULL		BTREE	
-t1	1	b	1	b	A	1	NULL	NULL		BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	a	A	5	NULL	NULL		BTREE		
+t1	1	b	1	b	A	1	NULL	NULL		BTREE		
 drop table t1;
 create table t1 (a int not null, b int not null, c int not null, primary key (a),key(b));
 insert into t1 values (3,3,3),(1,1,1),(2,2,2),(4,4,4);
@@ -360,13 +360,13 @@ check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 show index from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	b	1	b	A	5	NULL	NULL	YES	BTREE	
-t1	1	c	1	c	A	5	NULL	NULL	YES	BTREE	
-t1	1	a	1	a	A	1	NULL	NULL		BTREE	
-t1	1	a	2	b	A	5	NULL	NULL	YES	BTREE	
-t1	1	c_2	1	c	A	5	NULL	NULL	YES	BTREE	
-t1	1	c_2	2	a	A	5	NULL	NULL		BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	b	1	b	A	5	NULL	NULL	YES	BTREE		
+t1	1	c	1	c	A	5	NULL	NULL	YES	BTREE		
+t1	1	a	1	a	A	1	NULL	NULL		BTREE		
+t1	1	a	2	b	A	5	NULL	NULL	YES	BTREE		
+t1	1	c_2	1	c	A	5	NULL	NULL	YES	BTREE		
+t1	1	c_2	2	a	A	5	NULL	NULL		BTREE		
 explain select * from t1,t2 where t1.a=t2.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	2	
@@ -575,6 +575,7 @@ select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
 a	a	b
 1	1	1
 2	2	1
+unlock tables;
 drop table t1,t2;
 set autocommit=1;
 CREATE TABLE t1 (c1 varchar(250) NOT NULL) ROW_FORMAT=DYNAMIC;
@@ -589,6 +590,7 @@ INSERT INTO t2 VALUES ('test000001'), ('test000005');
 SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2
 WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;
 t1c1	t2c1
+unlock tables;
 DROP TABLE t1,t2;
 CREATE TABLE t1 (`a` int(11) NOT NULL default '0', `b` int(11) NOT NULL default '0', UNIQUE KEY `a` USING RTREE (`a`,`b`));
 Got one of the listed errors
@@ -620,29 +622,29 @@ Error	1146	Table 'test.t3' doesn't exist
 drop table t1,t2;
 create table t1 (a int, key (a));
 show keys from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE		
 alter table t1 disable keys;
 show keys from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE	disabled
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE	disabled	
 create table t2 (a int);
 set @@rand_seed1=31415926,@@rand_seed2=2718281828;
 insert t1 select * from t2;
 show keys from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE	disabled
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE	disabled	
 alter table t1 enable keys;
 show keys from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	1000	NULL	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	a	1	a	A	1000	NULL	NULL	YES	BTREE		
 alter table t1 engine=heap;
 alter table t1 disable keys;
 Warnings:
 Note	1031	Table storage engine for 't1' doesn't have this option
 show keys from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	NULL	500	NULL	NULL	YES	HASH	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	a	1	a	NULL	500	NULL	NULL	YES	HASH		
 drop table t1,t2;
 create table t1 ( a tinytext, b char(1), index idx (a(1),b) );
 insert into t1 values (null,''), (null,'');
@@ -712,16 +714,16 @@ analyze table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 show index from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	10	NULL	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	a	1	a	A	10	NULL	NULL	YES	BTREE		
 insert into t1 values (11);
 delete from t1 where a=11;
 check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 show index from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	10	NULL	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	a	1	a	A	10	NULL	NULL	YES	BTREE		
 set aria_stats_method=nulls_equal;
 show variables like 'aria_stats_method';
 Variable_name	Value
@@ -732,16 +734,16 @@ analyze table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 show index from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	5	NULL	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	a	1	a	A	5	NULL	NULL	YES	BTREE		
 insert into t1 values (11);
 delete from t1 where a=11;
 check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 show index from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	5	NULL	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	a	1	a	A	5	NULL	NULL	YES	BTREE		
 set aria_stats_method=DEFAULT;
 show variables like 'aria_stats_method';
 Variable_name	Value
@@ -752,16 +754,16 @@ analyze table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 show index from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	10	NULL	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	a	1	a	A	10	NULL	NULL	YES	BTREE		
 insert into t1 values (11);
 delete from t1 where a=11;
 check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 show index from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	10	NULL	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	a	1	a	A	10	NULL	NULL	YES	BTREE		
 drop table t1;
 set aria_stats_method=nulls_ignored;
 show variables like 'aria_stats_method';
@@ -779,21 +781,21 @@ analyze table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 show index from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	2	NULL	NULL	YES	BTREE	
-t1	1	a	2	b	A	4	NULL	NULL	YES	BTREE	
-t1	1	a	3	c	A	4	NULL	NULL	YES	BTREE	
-t1	1	a	4	d	A	4	NULL	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	a	1	a	A	2	NULL	NULL	YES	BTREE		
+t1	1	a	2	b	A	4	NULL	NULL	YES	BTREE		
+t1	1	a	3	c	A	4	NULL	NULL	YES	BTREE		
+t1	1	a	4	d	A	4	NULL	NULL	YES	BTREE		
 delete from t1;
 analyze table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 show index from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	0	NULL	NULL	YES	BTREE	
-t1	1	a	2	b	A	0	NULL	NULL	YES	BTREE	
-t1	1	a	3	c	A	0	NULL	NULL	YES	BTREE	
-t1	1	a	4	d	A	0	NULL	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	a	1	a	A	0	NULL	NULL	YES	BTREE		
+t1	1	a	2	b	A	0	NULL	NULL	YES	BTREE		
+t1	1	a	3	c	A	0	NULL	NULL	YES	BTREE		
+t1	1	a	4	d	A	0	NULL	NULL	YES	BTREE		
 set aria_stats_method=DEFAULT;
 drop table t1;
 create table t1(
@@ -1639,13 +1641,13 @@ analyze table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	Table is already up to date
 show keys from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	8	NULL	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	a	1	a	A	8	NULL	NULL	YES	BTREE		
 alter table t1 disable keys;
 alter table t1 enable keys;
 show keys from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	8	NULL	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	1	a	1	a	A	8	NULL	NULL	YES	BTREE		
 drop table t1;
 show create table t1;
 show create table t1;
@@ -2530,6 +2532,7 @@ insert into t1 values (1);
 lock table t1 write concurrent;
 delete from t1;
 ERROR 42000: The storage engine for the table doesn't support DELETE in WRITE CONCURRENT
+unlock tables;
 drop table t1;
 create table t1 (p int primary key, i int, a char(10), key k1(i), key k2(a))
 engine aria;
@@ -2584,12 +2587,6 @@ insert into t1 values (1);
 alter table t1 partition by list (s1) (partition p1 values in (2));
 ERROR HY000: Table has no partition for value 1
 drop table t1;
-create table t1 (c1 int);
-create table t2 (c1 int);
-lock table t1 read, t2 read;
-flush tables with read lock;
-unlock tables;
-drop table t1, t2;
 create table t1(a int primary key, b blob, c blob) engine=aria;
 insert into t1 values(1,repeat('a',100), repeat('b',657860));
 Warnings:
diff --git a/mysql-test/suite/maria/r/maria2.result b/mysql-test/suite/maria/r/maria2.result
index f145a4884e7..a0ec440b662 100644
--- a/mysql-test/suite/maria/r/maria2.result
+++ b/mysql-test/suite/maria/r/maria2.result
@@ -29,6 +29,7 @@ count(*)
 select * from t1;
 i
 2
+unlock tables;
 drop table t1,t2;
 create table t1(id int, s char(1), unique(s)) engine=aria;
 insert into t1 values(1,"a") on duplicate key update t1.id=t1.id+1;
diff --git a/mysql-test/suite/maria/r/maria3.result b/mysql-test/suite/maria/r/maria3.result
index 2311669640b..a05efb1a1f2 100644
--- a/mysql-test/suite/maria/r/maria3.result
+++ b/mysql-test/suite/maria/r/maria3.result
@@ -4,7 +4,7 @@ Aria	YES	Crash-safe tables with MyISAM heritage	YES	NO	NO
 set global storage_engine=aria;
 set session storage_engine=aria;
 set global aria_page_checksum=0;
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 drop table if exists t1,t2;
 SET SQL_WARNINGS=1;
 create table t1 (a int not null, key `a` (a) key_block_size=512);
@@ -231,7 +231,6 @@ insert into t1 values (1,1,"aaa"),(1,2,null);
 checksum table t1;
 Table	Checksum
 test.t1	1112804611
-lock table t1 write;
 insert into t1 values (1,3,repeat('c',30000)),(4,4,repeat('a',30000));
 update t1 set v="row5" where b=4;
 delete from t1 where b=3;
@@ -312,7 +311,7 @@ aria_log_file_size	4294959104
 aria_log_purge_type	immediate
 aria_max_sort_file_size	9223372036853727232
 aria_pagecache_age_threshold	300
-aria_pagecache_buffer_size	134213632
+aria_pagecache_buffer_size	134217728
 aria_pagecache_division_limit	100
 aria_page_checksum	OFF
 aria_recover	NORMAL
@@ -395,7 +394,7 @@ t1	CREATE TABLE `t1` (
 drop table t1;
 set global aria_log_file_size=4294967296;
 Warnings:
-Warning	1292	Truncated incorrect log_file_size value: '4294967296'
+Warning	1292	Truncated incorrect aria_log_file_size value: '4294967296'
 create table t1 (a int not null);
 lock tables t1 write;
 insert into t1 values (1),(2);
@@ -513,7 +512,7 @@ drop table t1;
 create table t1 (n int not null, c char(1)) engine=aria transactional=1;
 alter table t1 engine=myisam;
 Warnings:
-Error	1478	Table storage engine 'MyISAM' does not support the create option 'TRANSACTIONAL=1'
+Warning	1478	Table storage engine 'MyISAM' does not support the create option 'TRANSACTIONAL=1'
 alter table t1 engine=aria;
 show create table t1;
 Table	Create Table
@@ -524,7 +523,7 @@ t1	CREATE TABLE `t1` (
 drop table t1;
 create table t1 (n int not null, c char(1)) engine=myisam transactional=1;
 Warnings:
-Error	1478	Table storage engine 'MyISAM' does not support the create option 'TRANSACTIONAL=1'
+Warning	1478	Table storage engine 'MyISAM' does not support the create option 'TRANSACTIONAL=1'
 alter table t1 engine=aria;
 show create table t1;
 Table	Create Table
diff --git a/mysql-test/suite/maria/r/ps_maria.result b/mysql-test/suite/maria/r/ps_maria.result
index 30f7edb8a99..98e6b1b1f8b 100644
--- a/mysql-test/suite/maria/r/ps_maria.result
+++ b/mysql-test/suite/maria/r/ps_maria.result
@@ -59,8 +59,8 @@ def	test	t9	t9	c7	c7	4	12	1	Y	32768	31	63
 def	test	t9	t9	c8	c8	5	22	1	Y	32768	31	63
 def	test	t9	t9	c9	c9	5	22	1	Y	32768	31	63
 def	test	t9	t9	c10	c10	5	22	1	Y	32768	31	63
-def	test	t9	t9	c11	c11	246	9	6	Y	0	4	63
-def	test	t9	t9	c12	c12	246	10	6	Y	0	4	63
+def	test	t9	t9	c11	c11	246	9	6	Y	32768	4	63
+def	test	t9	t9	c12	c12	246	10	6	Y	32768	4	63
 def	test	t9	t9	c13	c13	10	10	10	Y	128	0	63
 def	test	t9	t9	c14	c14	12	19	19	Y	128	0	63
 def	test	t9	t9	c15	c15	7	19	19	N	9441	0	63
@@ -1788,11 +1788,11 @@ t5	CREATE TABLE `t5` (
   `const06` varchar(10) NOT NULL DEFAULT '',
   `param06` longtext,
   `const07` date DEFAULT NULL,
-  `param07` longblob,
+  `param07` longtext,
   `const08` varchar(19) NOT NULL DEFAULT '',
   `param08` longtext,
   `const09` datetime DEFAULT NULL,
-  `param09` longblob,
+  `param09` longtext,
   `const10` int(10) NOT NULL DEFAULT '0',
   `param10` bigint(20) DEFAULT NULL,
   `const11` int(4) DEFAULT NULL,
@@ -1807,8 +1807,8 @@ select * from t5 ;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def	test	t5	t5	const01	const01	3	1	1	N	32769	0	63
 def	test	t5	t5	param01	param01	8	20	1	Y	32768	0	63
-def	test	t5	t5	const02	const02	246	4	3	N	1	1	63
-def	test	t5	t5	param02	param02	246	67	32	Y	0	30	63
+def	test	t5	t5	const02	const02	246	4	3	N	32769	1	63
+def	test	t5	t5	param02	param02	246	67	32	Y	32768	30	63
 def	test	t5	t5	const03	const03	5	17	1	N	32769	31	63
 def	test	t5	t5	param03	param03	5	23	1	Y	32768	31	63
 def	test	t5	t5	const04	const04	253	3	3	N	1	0	8
@@ -1818,18 +1818,18 @@ def	test	t5	t5	param05	param05	252	4294967295	3	Y	144	0	63
 def	test	t5	t5	const06	const06	253	10	10	N	1	0	8
 def	test	t5	t5	param06	param06	252	4294967295	10	Y	16	0	8
 def	test	t5	t5	const07	const07	10	10	10	Y	128	0	63
-def	test	t5	t5	param07	param07	252	4294967295	10	Y	144	0	63
+def	test	t5	t5	param07	param07	252	4294967295	10	Y	16	0	8
 def	test	t5	t5	const08	const08	253	19	19	N	1	0	8
 def	test	t5	t5	param08	param08	252	4294967295	19	Y	16	0	8
 def	test	t5	t5	const09	const09	12	19	19	Y	128	0	63
-def	test	t5	t5	param09	param09	252	4294967295	19	Y	144	0	63
+def	test	t5	t5	param09	param09	252	4294967295	19	Y	16	0	8
 def	test	t5	t5	const10	const10	3	10	9	N	32769	0	63
 def	test	t5	t5	param10	param10	8	20	9	Y	32768	0	63
 def	test	t5	t5	const11	const11	3	4	4	Y	32768	0	63
 def	test	t5	t5	param11	param11	8	20	4	Y	32768	0	63
 def	test	t5	t5	const12	const12	254	0	0	Y	128	0	63
 def	test	t5	t5	param12	param12	8	20	0	Y	32768	0	63
-def	test	t5	t5	param13	param13	246	67	0	Y	0	30	63
+def	test	t5	t5	param13	param13	246	67	0	Y	32768	30	63
 def	test	t5	t5	param14	param14	252	4294967295	0	Y	16	0	8
 def	test	t5	t5	param15	param15	252	4294967295	0	Y	144	0	63
 const01	8
@@ -1927,28 +1927,28 @@ def					@arg07	5	23	1	Y	32896	31	63
 def					@arg08	5	23	1	Y	32896	31	63
 def					@arg09	5	23	1	Y	32896	31	63
 def					@arg10	5	23	1	Y	32896	31	63
-def					@arg11	246	83	6	Y	128	30	63
-def					@arg12	246	83	6	Y	128	30	63
-def					@arg13	251	16777216	10	Y	128	31	63
-def					@arg14	251	16777216	19	Y	128	31	63
-def					@arg15	251	16777216	19	Y	128	31	63
-def					@arg16	251	16777216	8	Y	128	31	63
+def					@arg11	246	83	6	Y	32896	30	63
+def					@arg12	246	83	6	Y	32896	30	63
+def					@arg13	250	16777215	10	Y	0	31	8
+def					@arg14	250	16777215	19	Y	0	31	8
+def					@arg15	250	16777215	19	Y	0	31	8
+def					@arg16	250	16777215	8	Y	0	31	8
 def					@arg17	8	20	4	Y	32928	0	63
 def					@arg18	8	20	1	Y	32896	0	63
 def					@arg19	8	20	1	Y	32896	0	63
-def					@arg20	251	16777216	1	Y	0	31	8
-def					@arg21	251	16777216	10	Y	0	31	8
-def					@arg22	251	16777216	30	Y	0	31	8
-def					@arg23	251	16777216	8	Y	128	31	63
-def					@arg24	251	16777216	8	Y	0	31	8
-def					@arg25	251	16777216	4	Y	128	31	63
-def					@arg26	251	16777216	4	Y	0	31	8
-def					@arg27	251	16777216	10	Y	128	31	63
-def					@arg28	251	16777216	10	Y	0	31	8
-def					@arg29	251	16777216	8	Y	128	31	63
-def					@arg30	251	16777216	8	Y	0	31	8
-def					@arg31	251	16777216	3	Y	0	31	8
-def					@arg32	251	16777216	6	Y	0	31	8
+def					@arg20	250	16777215	1	Y	0	31	8
+def					@arg21	250	16777215	10	Y	0	31	8
+def					@arg22	250	16777215	30	Y	0	31	8
+def					@arg23	250	16777215	8	Y	128	31	63
+def					@arg24	250	16777215	8	Y	0	31	8
+def					@arg25	250	16777215	4	Y	128	31	63
+def					@arg26	250	16777215	4	Y	0	31	8
+def					@arg27	250	16777215	10	Y	128	31	63
+def					@arg28	250	16777215	10	Y	0	31	8
+def					@arg29	250	16777215	8	Y	128	31	63
+def					@arg30	250	16777215	8	Y	0	31	8
+def					@arg31	250	16777215	3	Y	0	31	8
+def					@arg32	250	16777215	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1.0000	1.0000	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select @arg01:=  c1, @arg02:=  c2, @arg03:=  c3, @arg04:=  c4,
@@ -1974,28 +1974,28 @@ def					@arg07	5	23	0	Y	32896	31	63
 def					@arg08	5	23	0	Y	32896	31	63
 def					@arg09	5	23	0	Y	32896	31	63
 def					@arg10	5	23	0	Y	32896	31	63
-def					@arg11	246	83	0	Y	128	30	63
-def					@arg12	246	83	0	Y	128	30	63
-def					@arg13	251	16777216	0	Y	128	31	63
-def					@arg14	251	16777216	0	Y	128	31	63
-def					@arg15	251	16777216	19	Y	128	31	63
-def					@arg16	251	16777216	0	Y	128	31	63
+def					@arg11	246	83	0	Y	32896	30	63
+def					@arg12	246	83	0	Y	32896	30	63
+def					@arg13	250	16777215	0	Y	0	31	8
+def					@arg14	250	16777215	0	Y	0	31	8
+def					@arg15	250	16777215	19	Y	0	31	8
+def					@arg16	250	16777215	0	Y	0	31	8
 def					@arg17	8	20	0	Y	32928	0	63
 def					@arg18	8	20	0	Y	32896	0	63
 def					@arg19	8	20	0	Y	32896	0	63
-def					@arg20	251	16777216	0	Y	0	31	8
-def					@arg21	251	16777216	0	Y	0	31	8
-def					@arg22	251	16777216	0	Y	0	31	8
-def					@arg23	251	16777216	0	Y	128	31	63
-def					@arg24	251	16777216	0	Y	0	31	8
-def					@arg25	251	16777216	0	Y	128	31	63
-def					@arg26	251	16777216	0	Y	0	31	8
-def					@arg27	251	16777216	0	Y	128	31	63
-def					@arg28	251	16777216	0	Y	0	31	8
-def					@arg29	251	16777216	0	Y	128	31	63
-def					@arg30	251	16777216	0	Y	0	31	8
-def					@arg31	251	16777216	0	Y	0	31	8
-def					@arg32	251	16777216	0	Y	0	31	8
+def					@arg20	250	16777215	0	Y	0	31	8
+def					@arg21	250	16777215	0	Y	0	31	8
+def					@arg22	250	16777215	0	Y	0	31	8
+def					@arg23	250	16777215	0	Y	128	31	63
+def					@arg24	250	16777215	0	Y	0	31	8
+def					@arg25	250	16777215	0	Y	128	31	63
+def					@arg26	250	16777215	0	Y	0	31	8
+def					@arg27	250	16777215	0	Y	128	31	63
+def					@arg28	250	16777215	0	Y	0	31	8
+def					@arg29	250	16777215	0	Y	128	31	63
+def					@arg30	250	16777215	0	Y	0	31	8
+def					@arg31	250	16777215	0	Y	0	31	8
+def					@arg32	250	16777215	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select 
@@ -2024,28 +2024,28 @@ def					@arg07	5	23	1	Y	32896	31	63
 def					@arg08	5	23	1	Y	32896	31	63
 def					@arg09	5	23	1	Y	32896	31	63
 def					@arg10	5	23	1	Y	32896	31	63
-def					@arg11	246	83	6	Y	128	30	63
-def					@arg12	246	83	6	Y	128	30	63
-def					@arg13	251	16777216	10	Y	128	31	63
-def					@arg14	251	16777216	19	Y	128	31	63
-def					@arg15	251	16777216	19	Y	128	31	63
-def					@arg16	251	16777216	8	Y	128	31	63
+def					@arg11	246	83	6	Y	32896	30	63
+def					@arg12	246	83	6	Y	32896	30	63
+def					@arg13	250	16777215	10	Y	0	31	8
+def					@arg14	250	16777215	19	Y	0	31	8
+def					@arg15	250	16777215	19	Y	0	31	8
+def					@arg16	250	16777215	8	Y	0	31	8
 def					@arg17	8	20	4	Y	32928	0	63
 def					@arg18	8	20	1	Y	32896	0	63
 def					@arg19	8	20	1	Y	32896	0	63
-def					@arg20	251	16777216	1	Y	0	31	8
-def					@arg21	251	16777216	10	Y	0	31	8
-def					@arg22	251	16777216	30	Y	0	31	8
-def					@arg23	251	16777216	8	Y	128	31	63
-def					@arg24	251	16777216	8	Y	0	31	8
-def					@arg25	251	16777216	4	Y	128	31	63
-def					@arg26	251	16777216	4	Y	0	31	8
-def					@arg27	251	16777216	10	Y	128	31	63
-def					@arg28	251	16777216	10	Y	0	31	8
-def					@arg29	251	16777216	8	Y	128	31	63
-def					@arg30	251	16777216	8	Y	0	31	8
-def					@arg31	251	16777216	3	Y	0	31	8
-def					@arg32	251	16777216	6	Y	0	31	8
+def					@arg20	250	16777215	1	Y	0	31	8
+def					@arg21	250	16777215	10	Y	0	31	8
+def					@arg22	250	16777215	30	Y	0	31	8
+def					@arg23	250	16777215	8	Y	128	31	63
+def					@arg24	250	16777215	8	Y	0	31	8
+def					@arg25	250	16777215	4	Y	128	31	63
+def					@arg26	250	16777215	4	Y	0	31	8
+def					@arg27	250	16777215	10	Y	128	31	63
+def					@arg28	250	16777215	10	Y	0	31	8
+def					@arg29	250	16777215	8	Y	128	31	63
+def					@arg30	250	16777215	8	Y	0	31	8
+def					@arg31	250	16777215	3	Y	0	31	8
+def					@arg32	250	16777215	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1.0000	1.0000	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
@@ -2064,28 +2064,28 @@ def					@arg07	5	23	0	Y	32896	31	63
 def					@arg08	5	23	0	Y	32896	31	63
 def					@arg09	5	23	0	Y	32896	31	63
 def					@arg10	5	23	0	Y	32896	31	63
-def					@arg11	246	83	0	Y	128	30	63
-def					@arg12	246	83	0	Y	128	30	63
-def					@arg13	251	16777216	0	Y	128	31	63
-def					@arg14	251	16777216	0	Y	128	31	63
-def					@arg15	251	16777216	19	Y	128	31	63
-def					@arg16	251	16777216	0	Y	128	31	63
+def					@arg11	246	83	0	Y	32896	30	63
+def					@arg12	246	83	0	Y	32896	30	63
+def					@arg13	250	16777215	0	Y	0	31	8
+def					@arg14	250	16777215	0	Y	0	31	8
+def					@arg15	250	16777215	19	Y	0	31	8
+def					@arg16	250	16777215	0	Y	0	31	8
 def					@arg17	8	20	0	Y	32928	0	63
 def					@arg18	8	20	0	Y	32896	0	63
 def					@arg19	8	20	0	Y	32896	0	63
-def					@arg20	251	16777216	0	Y	0	31	8
-def					@arg21	251	16777216	0	Y	0	31	8
-def					@arg22	251	16777216	0	Y	0	31	8
-def					@arg23	251	16777216	0	Y	128	31	63
-def					@arg24	251	16777216	0	Y	0	31	8
-def					@arg25	251	16777216	0	Y	128	31	63
-def					@arg26	251	16777216	0	Y	0	31	8
-def					@arg27	251	16777216	0	Y	128	31	63
-def					@arg28	251	16777216	0	Y	0	31	8
-def					@arg29	251	16777216	0	Y	128	31	63
-def					@arg30	251	16777216	0	Y	0	31	8
-def					@arg31	251	16777216	0	Y	0	31	8
-def					@arg32	251	16777216	0	Y	0	31	8
+def					@arg20	250	16777215	0	Y	0	31	8
+def					@arg21	250	16777215	0	Y	0	31	8
+def					@arg22	250	16777215	0	Y	0	31	8
+def					@arg23	250	16777215	0	Y	128	31	63
+def					@arg24	250	16777215	0	Y	0	31	8
+def					@arg25	250	16777215	0	Y	128	31	63
+def					@arg26	250	16777215	0	Y	0	31	8
+def					@arg27	250	16777215	0	Y	128	31	63
+def					@arg28	250	16777215	0	Y	0	31	8
+def					@arg29	250	16777215	0	Y	128	31	63
+def					@arg30	250	16777215	0	Y	0	31	8
+def					@arg31	250	16777215	0	Y	0	31	8
+def					@arg32	250	16777215	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select ? := c1 from t9 where c1= 1" ;
@@ -2112,28 +2112,28 @@ def					@arg07	5	23	1	Y	32896	31	63
 def					@arg08	5	23	1	Y	32896	31	63
 def					@arg09	5	23	1	Y	32896	31	63
 def					@arg10	5	23	1	Y	32896	31	63
-def					@arg11	246	83	6	Y	128	30	63
-def					@arg12	246	83	6	Y	128	30	63
-def					@arg13	251	16777216	10	Y	128	31	63
-def					@arg14	251	16777216	19	Y	128	31	63
-def					@arg15	251	16777216	19	Y	128	31	63
-def					@arg16	251	16777216	8	Y	128	31	63
+def					@arg11	246	83	6	Y	32896	30	63
+def					@arg12	246	83	6	Y	32896	30	63
+def					@arg13	250	16777215	10	Y	0	31	8
+def					@arg14	250	16777215	19	Y	0	31	8
+def					@arg15	250	16777215	19	Y	0	31	8
+def					@arg16	250	16777215	8	Y	0	31	8
 def					@arg17	8	20	4	Y	32928	0	63
 def					@arg18	8	20	1	Y	32896	0	63
 def					@arg19	8	20	1	Y	32896	0	63
-def					@arg20	251	16777216	1	Y	0	31	8
-def					@arg21	251	16777216	10	Y	0	31	8
-def					@arg22	251	16777216	30	Y	0	31	8
-def					@arg23	251	16777216	8	Y	128	31	63
-def					@arg24	251	16777216	8	Y	0	31	8
-def					@arg25	251	16777216	4	Y	128	31	63
-def					@arg26	251	16777216	4	Y	0	31	8
-def					@arg27	251	16777216	10	Y	128	31	63
-def					@arg28	251	16777216	10	Y	0	31	8
-def					@arg29	251	16777216	8	Y	128	31	63
-def					@arg30	251	16777216	8	Y	0	31	8
-def					@arg31	251	16777216	3	Y	0	31	8
-def					@arg32	251	16777216	6	Y	0	31	8
+def					@arg20	250	16777215	1	Y	0	31	8
+def					@arg21	250	16777215	10	Y	0	31	8
+def					@arg22	250	16777215	30	Y	0	31	8
+def					@arg23	250	16777215	8	Y	128	31	63
+def					@arg24	250	16777215	8	Y	0	31	8
+def					@arg25	250	16777215	4	Y	128	31	63
+def					@arg26	250	16777215	4	Y	0	31	8
+def					@arg27	250	16777215	10	Y	128	31	63
+def					@arg28	250	16777215	10	Y	0	31	8
+def					@arg29	250	16777215	8	Y	128	31	63
+def					@arg30	250	16777215	8	Y	0	31	8
+def					@arg31	250	16777215	3	Y	0	31	8
+def					@arg32	250	16777215	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1.0000	1.0000	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,
@@ -2156,28 +2156,28 @@ def					@arg07	5	23	0	Y	32896	31	63
 def					@arg08	5	23	0	Y	32896	31	63
 def					@arg09	5	23	0	Y	32896	31	63
 def					@arg10	5	23	0	Y	32896	31	63
-def					@arg11	246	83	0	Y	128	30	63
-def					@arg12	246	83	0	Y	128	30	63
-def					@arg13	251	16777216	0	Y	128	31	63
-def					@arg14	251	16777216	0	Y	128	31	63
-def					@arg15	251	16777216	19	Y	128	31	63
-def					@arg16	251	16777216	0	Y	128	31	63
+def					@arg11	246	83	0	Y	32896	30	63
+def					@arg12	246	83	0	Y	32896	30	63
+def					@arg13	250	16777215	0	Y	0	31	8
+def					@arg14	250	16777215	0	Y	0	31	8
+def					@arg15	250	16777215	19	Y	0	31	8
+def					@arg16	250	16777215	0	Y	0	31	8
 def					@arg17	8	20	0	Y	32928	0	63
 def					@arg18	8	20	0	Y	32896	0	63
 def					@arg19	8	20	0	Y	32896	0	63
-def					@arg20	251	16777216	0	Y	0	31	8
-def					@arg21	251	16777216	0	Y	0	31	8
-def					@arg22	251	16777216	0	Y	0	31	8
-def					@arg23	251	16777216	0	Y	128	31	63
-def					@arg24	251	16777216	0	Y	0	31	8
-def					@arg25	251	16777216	0	Y	128	31	63
-def					@arg26	251	16777216	0	Y	0	31	8
-def					@arg27	251	16777216	0	Y	128	31	63
-def					@arg28	251	16777216	0	Y	0	31	8
-def					@arg29	251	16777216	0	Y	128	31	63
-def					@arg30	251	16777216	0	Y	0	31	8
-def					@arg31	251	16777216	0	Y	0	31	8
-def					@arg32	251	16777216	0	Y	0	31	8
+def					@arg20	250	16777215	0	Y	0	31	8
+def					@arg21	250	16777215	0	Y	0	31	8
+def					@arg22	250	16777215	0	Y	0	31	8
+def					@arg23	250	16777215	0	Y	128	31	63
+def					@arg24	250	16777215	0	Y	0	31	8
+def					@arg25	250	16777215	0	Y	128	31	63
+def					@arg26	250	16777215	0	Y	0	31	8
+def					@arg27	250	16777215	0	Y	128	31	63
+def					@arg28	250	16777215	0	Y	0	31	8
+def					@arg29	250	16777215	0	Y	128	31	63
+def					@arg30	250	16777215	0	Y	0	31	8
+def					@arg31	250	16777215	0	Y	0	31	8
+def					@arg32	250	16777215	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,
@@ -2202,28 +2202,28 @@ def					@arg07	5	23	1	Y	32896	31	63
 def					@arg08	5	23	1	Y	32896	31	63
 def					@arg09	5	23	1	Y	32896	31	63
 def					@arg10	5	23	1	Y	32896	31	63
-def					@arg11	246	83	6	Y	128	30	63
-def					@arg12	246	83	6	Y	128	30	63
-def					@arg13	251	16777216	10	Y	128	31	63
-def					@arg14	251	16777216	19	Y	128	31	63
-def					@arg15	251	16777216	19	Y	128	31	63
-def					@arg16	251	16777216	8	Y	128	31	63
+def					@arg11	246	83	6	Y	32896	30	63
+def					@arg12	246	83	6	Y	32896	30	63
+def					@arg13	250	16777215	10	Y	0	31	8
+def					@arg14	250	16777215	19	Y	0	31	8
+def					@arg15	250	16777215	19	Y	0	31	8
+def					@arg16	250	16777215	8	Y	0	31	8
 def					@arg17	8	20	4	Y	32928	0	63
 def					@arg18	8	20	1	Y	32896	0	63
 def					@arg19	8	20	1	Y	32896	0	63
-def					@arg20	251	16777216	1	Y	0	31	8
-def					@arg21	251	16777216	10	Y	0	31	8
-def					@arg22	251	16777216	30	Y	0	31	8
-def					@arg23	251	16777216	8	Y	128	31	63
-def					@arg24	251	16777216	8	Y	0	31	8
-def					@arg25	251	16777216	4	Y	128	31	63
-def					@arg26	251	16777216	4	Y	0	31	8
-def					@arg27	251	16777216	10	Y	128	31	63
-def					@arg28	251	16777216	10	Y	0	31	8
-def					@arg29	251	16777216	8	Y	128	31	63
-def					@arg30	251	16777216	8	Y	0	31	8
-def					@arg31	251	16777216	3	Y	0	31	8
-def					@arg32	251	16777216	6	Y	0	31	8
+def					@arg20	250	16777215	1	Y	0	31	8
+def					@arg21	250	16777215	10	Y	0	31	8
+def					@arg22	250	16777215	30	Y	0	31	8
+def					@arg23	250	16777215	8	Y	128	31	63
+def					@arg24	250	16777215	8	Y	0	31	8
+def					@arg25	250	16777215	4	Y	128	31	63
+def					@arg26	250	16777215	4	Y	0	31	8
+def					@arg27	250	16777215	10	Y	128	31	63
+def					@arg28	250	16777215	10	Y	0	31	8
+def					@arg29	250	16777215	8	Y	128	31	63
+def					@arg30	250	16777215	8	Y	0	31	8
+def					@arg31	250	16777215	3	Y	0	31	8
+def					@arg32	250	16777215	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1.0000	1.0000	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
@@ -2240,28 +2240,28 @@ def					@arg07	5	23	0	Y	32896	31	63
 def					@arg08	5	23	0	Y	32896	31	63
 def					@arg09	5	23	0	Y	32896	31	63
 def					@arg10	5	23	0	Y	32896	31	63
-def					@arg11	246	83	0	Y	128	30	63
-def					@arg12	246	83	0	Y	128	30	63
-def					@arg13	251	16777216	0	Y	128	31	63
-def					@arg14	251	16777216	0	Y	128	31	63
-def					@arg15	251	16777216	19	Y	128	31	63
-def					@arg16	251	16777216	0	Y	128	31	63
+def					@arg11	246	83	0	Y	32896	30	63
+def					@arg12	246	83	0	Y	32896	30	63
+def					@arg13	250	16777215	0	Y	0	31	8
+def					@arg14	250	16777215	0	Y	0	31	8
+def					@arg15	250	16777215	19	Y	0	31	8
+def					@arg16	250	16777215	0	Y	0	31	8
 def					@arg17	8	20	0	Y	32928	0	63
 def					@arg18	8	20	0	Y	32896	0	63
 def					@arg19	8	20	0	Y	32896	0	63
-def					@arg20	251	16777216	0	Y	0	31	8
-def					@arg21	251	16777216	0	Y	0	31	8
-def					@arg22	251	16777216	0	Y	0	31	8
-def					@arg23	251	16777216	0	Y	128	31	63
-def					@arg24	251	16777216	0	Y	0	31	8
-def					@arg25	251	16777216	0	Y	128	31	63
-def					@arg26	251	16777216	0	Y	0	31	8
-def					@arg27	251	16777216	0	Y	128	31	63
-def					@arg28	251	16777216	0	Y	0	31	8
-def					@arg29	251	16777216	0	Y	128	31	63
-def					@arg30	251	16777216	0	Y	0	31	8
-def					@arg31	251	16777216	0	Y	0	31	8
-def					@arg32	251	16777216	0	Y	0	31	8
+def					@arg20	250	16777215	0	Y	0	31	8
+def					@arg21	250	16777215	0	Y	0	31	8
+def					@arg22	250	16777215	0	Y	0	31	8
+def					@arg23	250	16777215	0	Y	128	31	63
+def					@arg24	250	16777215	0	Y	0	31	8
+def					@arg25	250	16777215	0	Y	128	31	63
+def					@arg26	250	16777215	0	Y	0	31	8
+def					@arg27	250	16777215	0	Y	128	31	63
+def					@arg28	250	16777215	0	Y	0	31	8
+def					@arg29	250	16777215	0	Y	128	31	63
+def					@arg30	250	16777215	0	Y	0	31	8
+def					@arg31	250	16777215	0	Y	0	31	8
+def					@arg32	250	16777215	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select c1 into ? from t9 where c1= 1" ;
@@ -2585,10 +2585,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	9.22337e+18
-c8	9.22337203685478e+18
-c9	9.22337203685478e+18
-c10	9.22337203685478e+18
+c7	9.22337e18
+c8	9.223372036854776e18
+c9	9.223372036854776e18
+c10	9.223372036854776e18
 c12	9999.9999
 execute my_delete ;
 set @arg00= '9223372036854775807' ;
@@ -2608,10 +2608,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	9.22337e+18
-c8	9.22337203685478e+18
-c9	9.22337203685478e+18
-c10	9.22337203685478e+18
+c7	9.22337e18
+c8	9.223372036854776e18
+c9	9.223372036854776e18
+c10	9.223372036854776e18
 c12	9999.9999
 execute my_delete ;
 set @arg00= -9223372036854775808 ;
@@ -2631,10 +2631,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-9.22337e+18
-c8	-9.22337203685478e+18
-c9	-9.22337203685478e+18
-c10	-9.22337203685478e+18
+c7	-9.22337e18
+c8	-9.223372036854776e18
+c9	-9.223372036854776e18
+c10	-9.223372036854776e18
 c12	-9999.9999
 execute my_delete ;
 set @arg00= '-9223372036854775808' ;
@@ -2654,10 +2654,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-9.22337e+18
-c8	-9.22337203685478e+18
-c9	-9.22337203685478e+18
-c10	-9.22337203685478e+18
+c7	-9.22337e18
+c8	-9.223372036854776e18
+c9	-9.223372036854776e18
+c10	-9.223372036854776e18
 c12	-9999.9999
 execute my_delete ;
 set @arg00= 1.11111111111111111111e+50 ;
@@ -2679,10 +2679,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	3.40282e+38
-c8	1.11111111111111e+50
-c9	1.11111111111111e+50
-c10	1.11111111111111e+50
+c7	3.40282e38
+c8	1.111111111111111e50
+c9	1.111111111111111e50
+c10	1.111111111111111e50
 c12	9999.9999
 execute my_delete ;
 set @arg00= '1.11111111111111111111e+50' ;
@@ -2704,10 +2704,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	3.40282e+38
-c8	1.11111111111111e+50
-c9	1.11111111111111e+50
-c10	1.11111111111111e+50
+c7	3.40282e38
+c8	1.111111111111111e50
+c9	1.111111111111111e50
+c10	1.111111111111111e50
 c12	9999.9999
 execute my_delete ;
 set @arg00= -1.11111111111111111111e+50 ;
@@ -2729,10 +2729,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-3.40282e+38
-c8	-1.11111111111111e+50
-c9	-1.11111111111111e+50
-c10	-1.11111111111111e+50
+c7	-3.40282e38
+c8	-1.111111111111111e50
+c9	-1.111111111111111e50
+c10	-1.111111111111111e50
 c12	-9999.9999
 execute my_delete ;
 set @arg00= '-1.11111111111111111111e+50' ;
@@ -2754,10 +2754,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-3.40282e+38
-c8	-1.11111111111111e+50
-c9	-1.11111111111111e+50
-c10	-1.11111111111111e+50
+c7	-3.40282e38
+c8	-1.111111111111111e50
+c9	-1.111111111111111e50
+c10	-1.111111111111111e50
 c12	-9999.9999
 execute my_delete ;
 test_sequence
@@ -2822,10 +2822,10 @@ c1	c20	c21	c22	c23	c24	c25	c26	c27	c28	c29	c30
 51	5	51.0	51.0	51.0	51.0	51.0	51.0	51.0	51.0	51.0	51.0
 52	5	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0
 53	5	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0
-54	5	54	54	54.00	54.00	54.00	54.00	54.00	54.00	54.00	54.00
-55	5	55	55	55	55	55	55	55	55	55	55
-56	6	56	56	56.00	56.00	56.00	56.00	56.00	56.00	56.00	56.00
-57	6	57	57	57.00	57.00	57.00	57.00	57.00	57.00	57.00	57.00
+54	5	54	54	54	54	54	54	54	54	54	54
+55	6	55	55	55	55	55	55	55	55	55	55
+56	6	56	56	56	56	56	56	56	56	56	56
+57	6	57	57	57	57	57	57	57	57	57	57
 60	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 61	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 62	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
@@ -3039,7 +3039,7 @@ c1	c13	c14	c15	c16	c17
 42	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 43	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 50	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-51	2010-00-00	2010-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
+51	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 52	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 53	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 60	NULL	NULL	1991-01-01 01:01:01	NULL	NULL
diff --git a/mysql-test/suite/maria/t/maria-connect.test b/mysql-test/suite/maria/t/maria-connect.test
index 9efb5844bc2..79ba45d2b13 100644
--- a/mysql-test/suite/maria/t/maria-connect.test
+++ b/mysql-test/suite/maria/t/maria-connect.test
@@ -27,7 +27,7 @@ insert t1 values (1),(2),(3);
 --error ER_DUP_ENTRY
 insert t1 values (4),(2),(5);
 select * from t1;
-SHOW BINLOG EVENTS FROM 106;
+SHOW BINLOG EVENTS FROM 107;
 drop table t1;
 set binlog_format=default;
 
diff --git a/mysql-test/suite/maria/t/maria-no-logging.test b/mysql-test/suite/maria/t/maria-no-logging.test
index f0533686588..7055a842510 100644
--- a/mysql-test/suite/maria/t/maria-no-logging.test
+++ b/mysql-test/suite/maria/t/maria-no-logging.test
@@ -4,7 +4,7 @@
 # can't restart server in embedded
 --source include/not_embedded.inc
 
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 
 --disable_warnings
 drop database if exists mysqltest;
diff --git a/mysql-test/suite/maria/t/maria-preload-master.opt b/mysql-test/suite/maria/t/maria-preload-master.opt
deleted file mode 100644
index 959cf74c816..00000000000
--- a/mysql-test/suite/maria/t/maria-preload-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---skip-safemalloc
diff --git a/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test b/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
index a943185d12f..b39b36ed3e1 100644
--- a/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
+++ b/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
@@ -7,7 +7,7 @@
 --source include/have_debug.inc
 --source include/have_maria.inc
 
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 let $MARIA_LOG=.;
 
 --disable_warnings
diff --git a/mysql-test/suite/maria/t/maria-recovery.test b/mysql-test/suite/maria/t/maria-recovery.test
index 6eb91c59dc1..b0f01f37d0d 100644
--- a/mysql-test/suite/maria/t/maria-recovery.test
+++ b/mysql-test/suite/maria/t/maria-recovery.test
@@ -5,7 +5,7 @@
 --source include/have_debug.inc
 --source include/have_maria.inc
 
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 let $MARIA_LOG=../../tmp;
 
 --disable_warnings
diff --git a/mysql-test/suite/maria/t/maria-recovery2.test b/mysql-test/suite/maria/t/maria-recovery2.test
index 81ea45fbd42..c1081d033ac 100644
--- a/mysql-test/suite/maria/t/maria-recovery2.test
+++ b/mysql-test/suite/maria/t/maria-recovery2.test
@@ -8,7 +8,7 @@
 call mtr.add_suppression("File '.*aria_log.000.*' not found \\(Errcode: 2\\)");
 call mtr.add_suppression("Table '.\/mysqltest\/t_corrupted1' is crashed, skipping it. Please repair it with aria_chk -r");
 
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 let $MARIA_LOG=../../tmp;
 
 --disable_warnings
diff --git a/mysql-test/suite/maria/t/maria-recovery3.test b/mysql-test/suite/maria/t/maria-recovery3.test
index 192361633ca..a5fd55499a2 100644
--- a/mysql-test/suite/maria/t/maria-recovery3.test
+++ b/mysql-test/suite/maria/t/maria-recovery3.test
@@ -5,7 +5,7 @@
 --source include/have_debug.inc
 --source include/have_maria.inc
 
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 let $MARIA_LOG=../../tmp;
 
 --disable_warnings
diff --git a/mysql-test/suite/maria/t/maria.test b/mysql-test/suite/maria/t/maria.test
index ccbe2c99037..482f49d2ca1 100644
--- a/mysql-test/suite/maria/t/maria.test
+++ b/mysql-test/suite/maria/t/maria.test
@@ -14,7 +14,7 @@ set global storage_engine=aria;
 set session storage_engine=aria;
 set global aria_page_checksum=0;
 let $default_log_file_size=`select @@global.aria_log_file_size`;
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 
 # Initialise
 --disable_warnings
@@ -551,6 +551,7 @@ commit;
 disconnect root;
 connection default;
 select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
+unlock tables;
 drop table t1,t2;
 set autocommit=1;
 #
@@ -569,6 +570,7 @@ disconnect con1;
 connection default;
 SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2
   WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;
+unlock tables;
 DROP TABLE t1,t2;
 
 #
@@ -1793,6 +1795,7 @@ lock table t1 write concurrent;
 # should be fixed with fully implemented versioning
 --error ER_CHECK_NOT_IMPLEMENTED
 delete from t1;
+unlock tables;
 drop table t1;
 
 #
@@ -1852,16 +1855,6 @@ alter table t1 partition by list (s1) (partition p1 values in (2));
 drop table t1;
 
 #
-# Bug #39226 Aria: crash with FLUSH TABLES WITH READ LOCK after LOCK TABLES
-
-create table t1 (c1 int);
-create table t2 (c1 int);
-lock table t1 read, t2 read;
-flush tables with read lock;
-unlock tables;
-drop table t1, t2;
-
-#
 # Bug #40311
 # Crash when aborting inserting of row with 2 blobs where first is short
 #
diff --git a/mysql-test/suite/maria/t/maria2.test b/mysql-test/suite/maria/t/maria2.test
index 00bbea165ee..df691569e05 100644
--- a/mysql-test/suite/maria/t/maria2.test
+++ b/mysql-test/suite/maria/t/maria2.test
@@ -83,6 +83,7 @@ insert into t1 values (2);
 alter table t1 modify i bigint default 1;
 select count(*) from t1;
 select * from t1;
+unlock tables;
 drop table t1,t2;
 
 #
diff --git a/mysql-test/suite/maria/t/maria3.test b/mysql-test/suite/maria/t/maria3.test
index 55b5959a970..3cf395f66e7 100644
--- a/mysql-test/suite/maria/t/maria3.test
+++ b/mysql-test/suite/maria/t/maria3.test
@@ -8,7 +8,7 @@ set global storage_engine=aria;
 set session storage_engine=aria;
 set global aria_page_checksum=0;
 let $default_log_file_size=`select @@global.aria_log_file_size`;
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 
 # Initialise
 --disable_warnings
diff --git a/mysql-test/suite/parts/r/partition_repair_myisam.result b/mysql-test/suite/parts/r/partition_repair_myisam.result
index 4af00ddcc6d..2d0a26b397c 100644
--- a/mysql-test/suite/parts/r/partition_repair_myisam.result
+++ b/mysql-test/suite/parts/r/partition_repair_myisam.result
@@ -408,7 +408,7 @@ ALTER TABLE t1_will_crash CHECK PARTITION p6;
 Table	Op	Msg_type	Msg_text
 test.t1_will_crash	check	warning	Size of datafile is: 868       Should be: 604
 test.t1_will_crash	check	error	Record-count is not ok; is 8   Should be: 7
-test.t1_will_crash	check	warning	Found 10 parts. Should be: 7
+test.t1_will_crash	check	warning	Found 10 key parts. Should be: 7
 test.t1_will_crash	check	error	Partition p6 returned error
 test.t1_will_crash	check	error	Corrupt
 ALTER TABLE t1_will_crash REPAIR PARTITION p6;
diff --git a/mysql-test/suite/parts/r/partition_special_innodb.result b/mysql-test/suite/parts/r/partition_special_innodb.result
index 18d2addb295..cf47b9de3f1 100644
--- a/mysql-test/suite/parts/r/partition_special_innodb.result
+++ b/mysql-test/suite/parts/r/partition_special_innodb.result
@@ -133,14 +133,14 @@ partition pa1 max_rows=20 min_rows=2,
 partition pa2 max_rows=30 min_rows=3,
 partition pa3 max_rows=30 min_rows=4,
 partition pa4 max_rows=40 min_rows=2);
-ERROR 42000: Too many key parts specified; max 32 parts allowed
+ERROR HY000: Too many fields in 'list of partition fields'
 create table t1 (a date not null, b varchar(50) not null, c varchar(50) not null, d enum('m', 'w') not null, e int not null, f decimal (18,2) not null, g bigint not null, h tinyint not null, a1 date not null, b1 varchar(50) not null, c1 varchar(50) not null, d1 enum('m', 'w') not null, e1 int not null, f1 decimal (18,2) not null, g1 bigint not null, h1 tinyint not null, a2 date not null, b2 varchar(50) not null, c2 varchar(50) not null, d2 enum('m', 'w') not null, e2 int not null, f2 decimal (18,2) not null, g2 bigint not null, h2 tinyint not null, a3 date not null, b3 varchar(50) not null, c3 varchar(50) not null, d3 enum('m', 'w') not null, e3 int not null, f3 decimal (18,2) not null, g3 bigint not null, h3 tinyint not null, i char(255), primary key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3)) engine='InnoDB' 
 partition by key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3) (
 partition pa1 max_rows=20 min_rows=2,
 partition pa2 max_rows=30 min_rows=3,
 partition pa3 max_rows=30 min_rows=4,
 partition pa4 max_rows=40 min_rows=2);
-ERROR HY000: Too many fields in 'list of partition fields'
+drop table t1;
 create table t1 (a date not null, b varchar(50) not null, c varchar(50) not null, d enum('m', 'w') not null, e int not null, f decimal (18,2) not null, g bigint not null, h tinyint not null, a1 date not null, b1 varchar(50) not null, c1 varchar(50) not null, d1 enum('m', 'w') not null, e1 int not null, f1 decimal (18,2) not null, g1 bigint not null, h1 tinyint not null, a2 date not null, b2 varchar(50) not null, c2 varchar(50) not null, d2 enum('m', 'w') not null, e2 int not null, f2 decimal (18,2) not null, g2 bigint not null, h2 tinyint not null, a3 date not null, b3 varchar(50) not null, c3 varchar(50) not null, d3 enum('m', 'w') not null, e3 int not null, f3 decimal (18,2) not null, g3 bigint not null, h3 tinyint not null, i char(255), primary key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1)) engine='InnoDB' 
 partition by key(a,b,c,d,e,f,g,h) (
 partition pa1 max_rows=20 min_rows=2,
diff --git a/mysql-test/suite/parts/r/partition_special_myisam.result b/mysql-test/suite/parts/r/partition_special_myisam.result
index b4647a2a803..828be71c437 100644
--- a/mysql-test/suite/parts/r/partition_special_myisam.result
+++ b/mysql-test/suite/parts/r/partition_special_myisam.result
@@ -133,14 +133,14 @@ partition pa1 max_rows=20 min_rows=2,
 partition pa2 max_rows=30 min_rows=3,
 partition pa3 max_rows=30 min_rows=4,
 partition pa4 max_rows=40 min_rows=2);
-ERROR 42000: Too many key parts specified; max 32 parts allowed
+ERROR HY000: Too many fields in 'list of partition fields'
 create table t1 (a date not null, b varchar(50) not null, c varchar(50) not null, d enum('m', 'w') not null, e int not null, f decimal (18,2) not null, g bigint not null, h tinyint not null, a1 date not null, b1 varchar(50) not null, c1 varchar(50) not null, d1 enum('m', 'w') not null, e1 int not null, f1 decimal (18,2) not null, g1 bigint not null, h1 tinyint not null, a2 date not null, b2 varchar(50) not null, c2 varchar(50) not null, d2 enum('m', 'w') not null, e2 int not null, f2 decimal (18,2) not null, g2 bigint not null, h2 tinyint not null, a3 date not null, b3 varchar(50) not null, c3 varchar(50) not null, d3 enum('m', 'w') not null, e3 int not null, f3 decimal (18,2) not null, g3 bigint not null, h3 tinyint not null, i char(255), primary key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3)) engine='MyISAM' 
 partition by key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3) (
 partition pa1 max_rows=20 min_rows=2,
 partition pa2 max_rows=30 min_rows=3,
 partition pa3 max_rows=30 min_rows=4,
 partition pa4 max_rows=40 min_rows=2);
-ERROR HY000: Too many fields in 'list of partition fields'
+drop table t1;
 create table t1 (a date not null, b varchar(50) not null, c varchar(50) not null, d enum('m', 'w') not null, e int not null, f decimal (18,2) not null, g bigint not null, h tinyint not null, a1 date not null, b1 varchar(50) not null, c1 varchar(50) not null, d1 enum('m', 'w') not null, e1 int not null, f1 decimal (18,2) not null, g1 bigint not null, h1 tinyint not null, a2 date not null, b2 varchar(50) not null, c2 varchar(50) not null, d2 enum('m', 'w') not null, e2 int not null, f2 decimal (18,2) not null, g2 bigint not null, h2 tinyint not null, a3 date not null, b3 varchar(50) not null, c3 varchar(50) not null, d3 enum('m', 'w') not null, e3 int not null, f3 decimal (18,2) not null, g3 bigint not null, h3 tinyint not null, i char(255), primary key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1)) engine='MyISAM' 
 partition by key(a,b,c,d,e,f,g,h) (
 partition pa1 max_rows=20 min_rows=2,
diff --git a/mysql-test/suite/parts/t/partition_debug_innodb.test b/mysql-test/suite/parts/t/partition_debug_innodb.test
index c5d8df33213..ba7ca3059ae 100644
--- a/mysql-test/suite/parts/t/partition_debug_innodb.test
+++ b/mysql-test/suite/parts/t/partition_debug_innodb.test
@@ -5,6 +5,7 @@
 --source include/have_innodb.inc
 --source include/have_partition.inc
 --source include/not_valgrind.inc
+--source include/not_embedded.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;
diff --git a/mysql-test/suite/parts/t/partition_debug_myisam-master.opt b/mysql-test/suite/parts/t/partition_debug_myisam-master.opt
index 425fda95086..24264558cf0 100644
--- a/mysql-test/suite/parts/t/partition_debug_myisam-master.opt
+++ b/mysql-test/suite/parts/t/partition_debug_myisam-master.opt
@@ -1 +1 @@
---skip-stack-trace --skip-core-file
+--skip-stack-trace --skip-core-file --myisam-recover-option=off
diff --git a/mysql-test/suite/parts/t/partition_debug_myisam.test b/mysql-test/suite/parts/t/partition_debug_myisam.test
index a4d5ee4bf04..98560827ca9 100644
--- a/mysql-test/suite/parts/t/partition_debug_myisam.test
+++ b/mysql-test/suite/parts/t/partition_debug_myisam.test
@@ -4,6 +4,7 @@
 --source include/have_debug.inc
 --source include/have_partition.inc
 --source include/not_valgrind.inc
+--source include/not_embedded.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;
diff --git a/mysql-test/suite/parts/t/partition_debug_sync_innodb-master.opt b/mysql-test/suite/parts/t/partition_debug_sync_innodb-master.opt
index c610ea42924..115a0ba2cc8 100644
--- a/mysql-test/suite/parts/t/partition_debug_sync_innodb-master.opt
+++ b/mysql-test/suite/parts/t/partition_debug_sync_innodb-master.opt
@@ -1 +1 @@
---loose-innodb_file_per_table=1
+--loose-innodb_file_per_table
diff --git a/mysql-test/suite/parts/t/partition_special_innodb-master.opt b/mysql-test/suite/parts/t/partition_special_innodb-master.opt
index c69292bfe7a..79851bac7b2 100644
--- a/mysql-test/suite/parts/t/partition_special_innodb-master.opt
+++ b/mysql-test/suite/parts/t/partition_special_innodb-master.opt
@@ -1 +1 @@
---loose-innodb-lock-wait-timeout=2 --loose-innodb-file-per-table=1
+--loose-innodb-lock-wait-timeout=2 --loose-innodb-file-per-table
diff --git a/mysql-test/suite/percona/percona_innodb_deadlock_count.test b/mysql-test/suite/percona/percona_innodb_deadlock_count.test
index b0882a18dc1..7a7f0e5ddb7 100644
--- a/mysql-test/suite/percona/percona_innodb_deadlock_count.test
+++ b/mysql-test/suite/percona/percona_innodb_deadlock_count.test
@@ -1,4 +1,4 @@
---source include/have_innodb.inc
+--source include/have_xtradb.inc
 --echo # Establish connection con1 (user=root)
 connect (con1,localhost,root,,);
 --echo # Establish connection con2 (user=root)
diff --git a/mysql-test/suite/percona/percona_innodb_doublewrite_file.test b/mysql-test/suite/percona/percona_innodb_doublewrite_file.test
index 8068d561190..d9e94db8463 100644
--- a/mysql-test/suite/percona/percona_innodb_doublewrite_file.test
+++ b/mysql-test/suite/percona/percona_innodb_doublewrite_file.test
@@ -1,2 +1,2 @@
---source include/have_innodb.inc
+--source include/have_xtradb.inc
 show variables like 'innodb_doublewrite%';
diff --git a/mysql-test/suite/percona/percona_innodb_use_sys_stats_table-master.opt b/mysql-test/suite/percona/percona_innodb_use_sys_stats_table-master.opt
index c6865f5704c..7479e2036aa 100644
--- a/mysql-test/suite/percona/percona_innodb_use_sys_stats_table-master.opt
+++ b/mysql-test/suite/percona/percona_innodb_use_sys_stats_table-master.opt
@@ -1 +1 @@
---innodb_use_sys_stats_table
+--loose-innodb_use_sys_stats_table
diff --git a/mysql-test/suite/percona/percona_innodb_use_sys_stats_table.test b/mysql-test/suite/percona/percona_innodb_use_sys_stats_table.test
index 02791137f08..534b26a3b45 100644
--- a/mysql-test/suite/percona/percona_innodb_use_sys_stats_table.test
+++ b/mysql-test/suite/percona/percona_innodb_use_sys_stats_table.test
@@ -1,2 +1,2 @@
---source include/have_innodb.inc
+--source include/have_xtradb.inc
 show variables like 'innodb_use_sys_stats%';
diff --git a/mysql-test/suite/percona/percona_xtradb_admin_command.test b/mysql-test/suite/percona/percona_xtradb_admin_command.test
index 5dc3fb2b33a..b675c2afa21 100644
--- a/mysql-test/suite/percona/percona_xtradb_admin_command.test
+++ b/mysql-test/suite/percona/percona_xtradb_admin_command.test
@@ -1,3 +1,3 @@
---source include/have_innodb.inc
+--source include/have_xtradb.inc
 select * from information_schema.XTRADB_ADMIN_COMMAND;
 select * from information_schema.XTRADB_ADMIN_COMMAND /*!XTRA_HELLO*/;
diff --git a/mysql-test/suite/percona/percona_xtradb_bug317074.test b/mysql-test/suite/percona/percona_xtradb_bug317074.test
index abf5d8ee1f6..029e0f8fcdf 100644
--- a/mysql-test/suite/percona/percona_xtradb_bug317074.test
+++ b/mysql-test/suite/percona/percona_xtradb_bug317074.test
@@ -1,4 +1,4 @@
--- source include/have_innodb.inc
+-- source include/have_xtradb.inc
 
 SET @old_innodb_file_format=@@innodb_file_format;
 SET @old_innodb_file_per_table=@@innodb_file_per_table;
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade.result b/mysql-test/suite/perfschema/r/pfs_upgrade.result
index 31d12598357..08991726796 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result
@@ -8,24 +8,24 @@ use performance_schema;
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
 user_table
-ERROR 1050 (42S01) at line 183: Table 'COND_INSTANCES' already exists
-ERROR 1050 (42S01) at line 213: Table 'EVENTS_WAITS_CURRENT' already exists
-ERROR 1050 (42S01) at line 227: Table 'EVENTS_WAITS_HISTORY' already exists
-ERROR 1050 (42S01) at line 241: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
-ERROR 1050 (42S01) at line 262: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 283: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 303: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 320: Table 'FILE_INSTANCES' already exists
-ERROR 1050 (42S01) at line 339: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 376: Table 'MUTEX_INSTANCES' already exists
-ERROR 1050 (42S01) at line 394: Table 'PERFORMANCE_TIMERS' already exists
-ERROR 1050 (42S01) at line 412: Table 'RWLOCK_INSTANCES' already exists
-ERROR 1050 (42S01) at line 428: Table 'SETUP_CONSUMERS' already exists
-ERROR 1050 (42S01) at line 445: Table 'SETUP_INSTRUMENTS' already exists
-ERROR 1050 (42S01) at line 461: Table 'SETUP_TIMERS' already exists
-ERROR 1050 (42S01) at line 478: Table 'THREADS' already exists
-ERROR 1644 (HY000) at line 1118: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 181: Table 'COND_INSTANCES' already exists
+ERROR 1050 (42S01) at line 211: Table 'EVENTS_WAITS_CURRENT' already exists
+ERROR 1050 (42S01) at line 225: Table 'EVENTS_WAITS_HISTORY' already exists
+ERROR 1050 (42S01) at line 239: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
+ERROR 1050 (42S01) at line 260: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 281: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 301: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 318: Table 'FILE_INSTANCES' already exists
+ERROR 1050 (42S01) at line 337: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 357: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 374: Table 'MUTEX_INSTANCES' already exists
+ERROR 1050 (42S01) at line 392: Table 'PERFORMANCE_TIMERS' already exists
+ERROR 1050 (42S01) at line 410: Table 'RWLOCK_INSTANCES' already exists
+ERROR 1050 (42S01) at line 426: Table 'SETUP_CONSUMERS' already exists
+ERROR 1050 (42S01) at line 443: Table 'SETUP_INSTRUMENTS' already exists
+ERROR 1050 (42S01) at line 459: Table 'SETUP_TIMERS' already exists
+ERROR 1050 (42S01) at line 476: Table 'THREADS' already exists
+ERROR 1644 (HY000) at line 1119: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -38,24 +38,24 @@ use performance_schema;
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
 user_view
-ERROR 1050 (42S01) at line 183: Table 'COND_INSTANCES' already exists
-ERROR 1050 (42S01) at line 213: Table 'EVENTS_WAITS_CURRENT' already exists
-ERROR 1050 (42S01) at line 227: Table 'EVENTS_WAITS_HISTORY' already exists
-ERROR 1050 (42S01) at line 241: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
-ERROR 1050 (42S01) at line 262: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 283: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 303: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 320: Table 'FILE_INSTANCES' already exists
-ERROR 1050 (42S01) at line 339: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 376: Table 'MUTEX_INSTANCES' already exists
-ERROR 1050 (42S01) at line 394: Table 'PERFORMANCE_TIMERS' already exists
-ERROR 1050 (42S01) at line 412: Table 'RWLOCK_INSTANCES' already exists
-ERROR 1050 (42S01) at line 428: Table 'SETUP_CONSUMERS' already exists
-ERROR 1050 (42S01) at line 445: Table 'SETUP_INSTRUMENTS' already exists
-ERROR 1050 (42S01) at line 461: Table 'SETUP_TIMERS' already exists
-ERROR 1050 (42S01) at line 478: Table 'THREADS' already exists
-ERROR 1644 (HY000) at line 1118: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 181: Table 'COND_INSTANCES' already exists
+ERROR 1050 (42S01) at line 211: Table 'EVENTS_WAITS_CURRENT' already exists
+ERROR 1050 (42S01) at line 225: Table 'EVENTS_WAITS_HISTORY' already exists
+ERROR 1050 (42S01) at line 239: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
+ERROR 1050 (42S01) at line 260: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 281: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 301: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 318: Table 'FILE_INSTANCES' already exists
+ERROR 1050 (42S01) at line 337: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 357: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 374: Table 'MUTEX_INSTANCES' already exists
+ERROR 1050 (42S01) at line 392: Table 'PERFORMANCE_TIMERS' already exists
+ERROR 1050 (42S01) at line 410: Table 'RWLOCK_INSTANCES' already exists
+ERROR 1050 (42S01) at line 426: Table 'SETUP_CONSUMERS' already exists
+ERROR 1050 (42S01) at line 443: Table 'SETUP_INSTRUMENTS' already exists
+ERROR 1050 (42S01) at line 459: Table 'SETUP_TIMERS' already exists
+ERROR 1050 (42S01) at line 476: Table 'THREADS' already exists
+ERROR 1644 (HY000) at line 1119: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -66,24 +66,24 @@ drop view test.user_view;
 create procedure test.user_proc()
 select "Not supposed to be here";
 update mysql.proc set db='performance_schema' where name='user_proc';
-ERROR 1050 (42S01) at line 183: Table 'COND_INSTANCES' already exists
-ERROR 1050 (42S01) at line 213: Table 'EVENTS_WAITS_CURRENT' already exists
-ERROR 1050 (42S01) at line 227: Table 'EVENTS_WAITS_HISTORY' already exists
-ERROR 1050 (42S01) at line 241: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
-ERROR 1050 (42S01) at line 262: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 283: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 303: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 320: Table 'FILE_INSTANCES' already exists
-ERROR 1050 (42S01) at line 339: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 376: Table 'MUTEX_INSTANCES' already exists
-ERROR 1050 (42S01) at line 394: Table 'PERFORMANCE_TIMERS' already exists
-ERROR 1050 (42S01) at line 412: Table 'RWLOCK_INSTANCES' already exists
-ERROR 1050 (42S01) at line 428: Table 'SETUP_CONSUMERS' already exists
-ERROR 1050 (42S01) at line 445: Table 'SETUP_INSTRUMENTS' already exists
-ERROR 1050 (42S01) at line 461: Table 'SETUP_TIMERS' already exists
-ERROR 1050 (42S01) at line 478: Table 'THREADS' already exists
-ERROR 1644 (HY000) at line 1118: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 181: Table 'COND_INSTANCES' already exists
+ERROR 1050 (42S01) at line 211: Table 'EVENTS_WAITS_CURRENT' already exists
+ERROR 1050 (42S01) at line 225: Table 'EVENTS_WAITS_HISTORY' already exists
+ERROR 1050 (42S01) at line 239: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
+ERROR 1050 (42S01) at line 260: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 281: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 301: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 318: Table 'FILE_INSTANCES' already exists
+ERROR 1050 (42S01) at line 337: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 357: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 374: Table 'MUTEX_INSTANCES' already exists
+ERROR 1050 (42S01) at line 392: Table 'PERFORMANCE_TIMERS' already exists
+ERROR 1050 (42S01) at line 410: Table 'RWLOCK_INSTANCES' already exists
+ERROR 1050 (42S01) at line 426: Table 'SETUP_CONSUMERS' already exists
+ERROR 1050 (42S01) at line 443: Table 'SETUP_INSTRUMENTS' already exists
+ERROR 1050 (42S01) at line 459: Table 'SETUP_TIMERS' already exists
+ERROR 1050 (42S01) at line 476: Table 'THREADS' already exists
+ERROR 1644 (HY000) at line 1119: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -94,24 +94,24 @@ drop procedure test.user_proc;
 create function test.user_func() returns integer
 return 0;
 update mysql.proc set db='performance_schema' where name='user_func';
-ERROR 1050 (42S01) at line 183: Table 'COND_INSTANCES' already exists
-ERROR 1050 (42S01) at line 213: Table 'EVENTS_WAITS_CURRENT' already exists
-ERROR 1050 (42S01) at line 227: Table 'EVENTS_WAITS_HISTORY' already exists
-ERROR 1050 (42S01) at line 241: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
-ERROR 1050 (42S01) at line 262: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 283: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 303: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 320: Table 'FILE_INSTANCES' already exists
-ERROR 1050 (42S01) at line 339: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 376: Table 'MUTEX_INSTANCES' already exists
-ERROR 1050 (42S01) at line 394: Table 'PERFORMANCE_TIMERS' already exists
-ERROR 1050 (42S01) at line 412: Table 'RWLOCK_INSTANCES' already exists
-ERROR 1050 (42S01) at line 428: Table 'SETUP_CONSUMERS' already exists
-ERROR 1050 (42S01) at line 445: Table 'SETUP_INSTRUMENTS' already exists
-ERROR 1050 (42S01) at line 461: Table 'SETUP_TIMERS' already exists
-ERROR 1050 (42S01) at line 478: Table 'THREADS' already exists
-ERROR 1644 (HY000) at line 1118: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 181: Table 'COND_INSTANCES' already exists
+ERROR 1050 (42S01) at line 211: Table 'EVENTS_WAITS_CURRENT' already exists
+ERROR 1050 (42S01) at line 225: Table 'EVENTS_WAITS_HISTORY' already exists
+ERROR 1050 (42S01) at line 239: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
+ERROR 1050 (42S01) at line 260: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 281: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 301: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 318: Table 'FILE_INSTANCES' already exists
+ERROR 1050 (42S01) at line 337: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 357: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 374: Table 'MUTEX_INSTANCES' already exists
+ERROR 1050 (42S01) at line 392: Table 'PERFORMANCE_TIMERS' already exists
+ERROR 1050 (42S01) at line 410: Table 'RWLOCK_INSTANCES' already exists
+ERROR 1050 (42S01) at line 426: Table 'SETUP_CONSUMERS' already exists
+ERROR 1050 (42S01) at line 443: Table 'SETUP_INSTRUMENTS' already exists
+ERROR 1050 (42S01) at line 459: Table 'SETUP_TIMERS' already exists
+ERROR 1050 (42S01) at line 476: Table 'THREADS' already exists
+ERROR 1644 (HY000) at line 1119: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -122,24 +122,24 @@ drop function test.user_func;
 create event test.user_event on schedule every 1 day do
 select "not supposed to be here";
 update mysql.event set db='performance_schema' where name='user_event';
-ERROR 1050 (42S01) at line 183: Table 'COND_INSTANCES' already exists
-ERROR 1050 (42S01) at line 213: Table 'EVENTS_WAITS_CURRENT' already exists
-ERROR 1050 (42S01) at line 227: Table 'EVENTS_WAITS_HISTORY' already exists
-ERROR 1050 (42S01) at line 241: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
-ERROR 1050 (42S01) at line 262: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 283: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 303: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 320: Table 'FILE_INSTANCES' already exists
-ERROR 1050 (42S01) at line 339: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 376: Table 'MUTEX_INSTANCES' already exists
-ERROR 1050 (42S01) at line 394: Table 'PERFORMANCE_TIMERS' already exists
-ERROR 1050 (42S01) at line 412: Table 'RWLOCK_INSTANCES' already exists
-ERROR 1050 (42S01) at line 428: Table 'SETUP_CONSUMERS' already exists
-ERROR 1050 (42S01) at line 445: Table 'SETUP_INSTRUMENTS' already exists
-ERROR 1050 (42S01) at line 461: Table 'SETUP_TIMERS' already exists
-ERROR 1050 (42S01) at line 478: Table 'THREADS' already exists
-ERROR 1644 (HY000) at line 1118: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 181: Table 'COND_INSTANCES' already exists
+ERROR 1050 (42S01) at line 211: Table 'EVENTS_WAITS_CURRENT' already exists
+ERROR 1050 (42S01) at line 225: Table 'EVENTS_WAITS_HISTORY' already exists
+ERROR 1050 (42S01) at line 239: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
+ERROR 1050 (42S01) at line 260: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 281: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 301: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 318: Table 'FILE_INSTANCES' already exists
+ERROR 1050 (42S01) at line 337: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 357: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 374: Table 'MUTEX_INSTANCES' already exists
+ERROR 1050 (42S01) at line 392: Table 'PERFORMANCE_TIMERS' already exists
+ERROR 1050 (42S01) at line 410: Table 'RWLOCK_INSTANCES' already exists
+ERROR 1050 (42S01) at line 426: Table 'SETUP_CONSUMERS' already exists
+ERROR 1050 (42S01) at line 443: Table 'SETUP_INSTRUMENTS' already exists
+ERROR 1050 (42S01) at line 459: Table 'SETUP_TIMERS' already exists
+ERROR 1050 (42S01) at line 476: Table 'THREADS' already exists
+ERROR 1644 (HY000) at line 1119: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name
diff --git a/mysql-test/suite/perfschema/t/no_threads-master.opt b/mysql-test/suite/perfschema/t/no_threads-master.opt
index 0dfb498094a..63784bf7c66 100644
--- a/mysql-test/suite/perfschema/t/no_threads-master.opt
+++ b/mysql-test/suite/perfschema/t/no_threads-master.opt
@@ -1 +1 @@
---one-thread --thread-handling=no-threads --loose-performance-schema-max-thread_instances=10 --default-storage-engine=MyISAM --skip-innodb
+--one-thread --thread-handling=no-threads --loose-performance-schema-max-thread_instances=10 --default-storage-engine=MyISAM
diff --git a/mysql-test/suite/rpl/r/rpl_ddl.result b/mysql-test/suite/rpl/r/rpl_ddl.result
index af6b33966e9..a451b2e581a 100644
--- a/mysql-test/suite/rpl/r/rpl_ddl.result
+++ b/mysql-test/suite/rpl/r/rpl_ddl.result
@@ -878,11 +878,11 @@ TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
 SHOW INDEX FROM mysqltest1.t6;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 
 -------- switch to slave --------
 SHOW INDEX FROM mysqltest1.t6;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 
 -------- switch to master -------
 
@@ -927,13 +927,13 @@ TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
 SHOW INDEX FROM mysqltest1.t5;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t5	1	my_idx5	1	f1	A	0	NULL	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t5	1	my_idx5	1	f1	A	0	NULL	NULL	YES	BTREE		
 
 -------- switch to slave --------
 SHOW INDEX FROM mysqltest1.t5;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t5	1	my_idx5	1	f1	A	NULL	NULL	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t5	1	my_idx5	1	f1	A	NULL	NULL	NULL	YES	BTREE		
 
 -------- switch to master -------
 
diff --git a/mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result b/mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result
index b336fc12d42..ecc2987576c 100644
--- a/mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result
+++ b/mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result
@@ -9,7 +9,7 @@ USE mysqlslap;
 select @@global.binlog_format;
 @@global.binlog_format
 MIXED
-CREATE TABLE t1 (id INT primary key auto_increment, name VARCHAR(64));
+CREATE TABLE t1 (id INT primary key auto_increment, name VARCHAR(64)) ENGINE=MyISAM;
 FLUSH TABLE t1;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
diff --git a/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result b/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
index 47ce547fcac..7a5c6533641 100644
--- a/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
+++ b/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
@@ -4,6 +4,7 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+set session storage_engine=innodb;
 #########################################################################
 #                            CONFIGURATION
 #########################################################################
diff --git a/mysql-test/suite/rpl/r/rpl_optimize.result b/mysql-test/suite/rpl/r/rpl_optimize.result
index 8c4bcf48a65..542e9dfd6cb 100644
--- a/mysql-test/suite/rpl/r/rpl_optimize.result
+++ b/mysql-test/suite/rpl/r/rpl_optimize.result
@@ -5,7 +5,6 @@ reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 drop tables if exists t1;
-CALL mtr.add_suppression('Statement may not be safe to log in statement format.');
 create table t1 (a int not null auto_increment primary key, b int, key(b));
 INSERT INTO t1 (a) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 INSERT INTO t1 (a) SELECT null FROM t1;
diff --git a/mysql-test/suite/rpl/r/rpl_rotate_logs.result b/mysql-test/suite/rpl/r/rpl_rotate_logs.result
index 70e1d2f06e8..f529170d05e 100644
--- a/mysql-test/suite/rpl/r/rpl_rotate_logs.result
+++ b/mysql-test/suite/rpl/r/rpl_rotate_logs.result
@@ -82,14 +82,15 @@ master-bin.000005	#
 master-bin.000006	#
 master-bin.000007	#
 master-bin.000008	#
+master-bin.000009	#
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000008	#	<Binlog_Do_DB>	<Binlog_Ignore_DB>
+master-bin.000009	#	<Binlog_Do_DB>	<Binlog_Ignore_DB>
 select * from t4;
 a
 testing temporary tables part 2
-Master_Log_File	master-bin.000008
-Relay_Master_Log_File	master-bin.000008
+Master_Log_File	master-bin.000009
+Relay_Master_Log_File	master-bin.000009
 Checking that both slave threads are running.
 lock tables t3 read;
 select count(*) from t3 where n >= 4;
diff --git a/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result b/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result
index b9480abd4b8..d9e70ce95c5 100644
--- a/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result
+++ b/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result
@@ -4,6 +4,7 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+set session storage_engine=innodb;
 #########################################################################
 #                            CONFIGURATION
 #########################################################################
diff --git a/mysql-test/suite/rpl/r/rpl_row_loaddata_concurrent.result b/mysql-test/suite/rpl/r/rpl_row_loaddata_concurrent.result
index cb095ad561e..4b2948f9382 100644
--- a/mysql-test/suite/rpl/r/rpl_row_loaddata_concurrent.result
+++ b/mysql-test/suite/rpl/r/rpl_row_loaddata_concurrent.result
@@ -1,17 +1,17 @@
-CREATE TABLE t1 (c1 char(50));
+CREATE TABLE t1 (c1 char(50)) engine=myisam;
 LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
 LOAD DATA CONCURRENT INFILE '../../std_data/words.dat' INTO TABLE t1;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (c1 char(50))
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (c1 char(50)) engine=myisam
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+master-bin.000001	#	Query	#	#	COMMIT
 DROP TABLE t1;
 stop slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
diff --git a/mysql-test/suite/rpl/r/rpl_semi_sync.result b/mysql-test/suite/rpl/r/rpl_semi_sync.result
index 74eb14d33e0..13a5c179520 100644
--- a/mysql-test/suite/rpl/r/rpl_semi_sync.result
+++ b/mysql-test/suite/rpl/r/rpl_semi_sync.result
@@ -416,7 +416,7 @@ Rpl_semi_sync_slave_status	OFF
 # Test non-semi-sync slave connect to semi-sync master
 #
 set sql_log_bin=0;
-INSTALL PLUGIN rpl_semi_sync_master SONAME 'SEMISYNC_MASTER_PLUGIN';
+INSTALL PLUGIN rpl_semi_sync_master SONAME 'SEMISYNC_MASTER_SO';
 set global rpl_semi_sync_master_timeout= 5000;
 /* 5s */
 set sql_log_bin=1;
@@ -435,7 +435,7 @@ SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
 Variable_name	Value
 include/stop_slave.inc
 [ reinstall semi-sync slave plugin and disable semi-sync ]
-INSTALL PLUGIN rpl_semi_sync_slave SONAME 'SEMISYNC_SLAVE_PLUGIN';
+INSTALL PLUGIN rpl_semi_sync_slave SONAME 'SEMISYNC_SLAVE_SO';
 set global rpl_semi_sync_slave_enabled= 0;
 SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
 Variable_name	Value
diff --git a/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result b/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
index 6f53ad68d76..e48f1a7d0f3 100644
--- a/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
+++ b/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
@@ -4,6 +4,7 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+set session storage_engine=innodb;
 #########################################################################
 #                            CONFIGURATION
 #########################################################################
diff --git a/mysql-test/suite/rpl/r/rpl_stm_maria.result b/mysql-test/suite/rpl/r/rpl_stm_maria.result
index 1fe1fd87349..3a3ba256325 100644
--- a/mysql-test/suite/rpl/r/rpl_stm_maria.result
+++ b/mysql-test/suite/rpl/r/rpl_stm_maria.result
@@ -4,7 +4,7 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-CALL mtr.add_suppression('Statement may not be safe to log in statement format.');
+CALL mtr.add_suppression('Unsafe statement written to the binary log using statement format');
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t3;
diff --git a/mysql-test/suite/rpl/t/rpl_ip_mix2.test b/mysql-test/suite/rpl/t/rpl_ip_mix2.test
index 11c648dece5..5d687006b76 100644
--- a/mysql-test/suite/rpl/t/rpl_ip_mix2.test
+++ b/mysql-test/suite/rpl/t/rpl_ip_mix2.test
@@ -6,19 +6,7 @@
 # Options: --skip-name-resolve, master: --bind-address=0.0.0.0, slave: --bind-address=::
 # (see corresponding cnf file)
 #
-# Check if ipv6 is available. If not, server is crashing (see BUG#48915).
---disable_query_log
---disable_abort_on_error
-connect (checkcon123456789,::1,root,,test,$SLAVE_MYPORT);
-if($mysql_errno)
-{
-skip wrong IP for slave;
-}
-connection default;
-disconnect checkcon123456789;
---enable_abort_on_error
---enable_query_log
-# end check
+--source include/check_ipv6.inc
 --source include/have_log_bin.inc
 
 let $IPv6= ::1;
diff --git a/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test b/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test
index 6e1d3286f07..1a32c388921 100644
--- a/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test
+++ b/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test
@@ -6,4 +6,5 @@
 --source include/have_innodb.inc
 
 --let $engine=Innodb
+set session storage_engine=innodb;
 --source extra/rpl_tests/rpl_implicit_commit_binlog.test
diff --git a/mysql-test/suite/rpl/t/rpl_relayspace.test b/mysql-test/suite/rpl/t/rpl_relayspace.test
index 937ca5ed653..cd04c2ccc0b 100644
--- a/mysql-test/suite/rpl/t/rpl_relayspace.test
+++ b/mysql-test/suite/rpl/t/rpl_relayspace.test
@@ -5,7 +5,7 @@ source include/master-slave.inc;
 let $master_log_file= query_get_value(SHOW MASTER STATUS, File, 1);
 connection slave;
 stop slave;
-source include/wait_for_slave_to_stop.inc
+source include/wait_for_slave_to_stop.inc;
 connection master;
 # This will generate a master's binlog > 10 bytes
 create table t1 (a int);
diff --git a/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test b/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test
index 5c3b163eea3..8b54878a203 100644
--- a/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test
+++ b/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test
@@ -6,4 +6,5 @@
 --source include/have_innodb.inc
 
 --let $engine=Innodb
+set session storage_engine=innodb;
 --source extra/rpl_tests/rpl_implicit_commit_binlog.test
diff --git a/mysql-test/suite/rpl/t/rpl_row_loaddata_concurrent.test b/mysql-test/suite/rpl/t/rpl_row_loaddata_concurrent.test
index 1a4b1c1306d..cef259687fb 100644
--- a/mysql-test/suite/rpl/t/rpl_row_loaddata_concurrent.test
+++ b/mysql-test/suite/rpl/t/rpl_row_loaddata_concurrent.test
@@ -3,7 +3,7 @@
 -- source include/have_binlog_format_row.inc
 
 let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1);
-CREATE TABLE t1 (c1 char(50));
+CREATE TABLE t1 (c1 char(50)) engine=myisam;
 LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
 LOAD DATA CONCURRENT INFILE '../../std_data/words.dat' INTO TABLE t1;
 -- source include/show_binlog_events.inc
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync-master.opt b/mysql-test/suite/rpl/t/rpl_semi_sync-master.opt
deleted file mode 100644
index 58029d28ace..00000000000
--- a/mysql-test/suite/rpl/t/rpl_semi_sync-master.opt
+++ /dev/null
@@ -1 +0,0 @@
-$SEMISYNC_PLUGIN_OPT
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync-slave.opt b/mysql-test/suite/rpl/t/rpl_semi_sync-slave.opt
deleted file mode 100644
index 58029d28ace..00000000000
--- a/mysql-test/suite/rpl/t/rpl_semi_sync-slave.opt
+++ /dev/null
@@ -1 +0,0 @@
-$SEMISYNC_PLUGIN_OPT
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync.test b/mysql-test/suite/rpl/t/rpl_semi_sync.test
index 1bf4f1a3396..17fa67e97e3 100644
--- a/mysql-test/suite/rpl/t/rpl_semi_sync.test
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync.test
@@ -61,7 +61,7 @@ let $value = query_get_value(show variables like 'rpl_semi_sync_master_enabled',
 if (`select '$value' = 'No such row'`)
 {
     set sql_log_bin=0;
-    eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
+    eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_SO';
     set global rpl_semi_sync_master_timeout= 5000; /* 5s */
     set sql_log_bin=1;
 }
@@ -126,7 +126,7 @@ let $value= query_get_value(show variables like 'rpl_semi_sync_slave_enabled', V
 if (`select '$value' = 'No such row'`)
 {
     set sql_log_bin=0;
-    eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN';
+    eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_SO';
     set sql_log_bin=1;
 }
 enable_query_log;
@@ -566,8 +566,8 @@ SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
 
 connection master;
 set sql_log_bin=0;
-replace_result $SEMISYNC_MASTER_PLUGIN SEMISYNC_MASTER_PLUGIN;
-eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
+replace_result $SEMISYNC_MASTER_SO SEMISYNC_MASTER_SO;
+eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_SO';
 set global rpl_semi_sync_master_timeout= 5000; /* 5s */
 set sql_log_bin=1;
 set global rpl_semi_sync_master_enabled= 1;
@@ -585,8 +585,8 @@ SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
 source include/stop_slave.inc;
 
 echo [ reinstall semi-sync slave plugin and disable semi-sync ];
-replace_result $SEMISYNC_SLAVE_PLUGIN SEMISYNC_SLAVE_PLUGIN;
-eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN';
+replace_result $SEMISYNC_SLAVE_SO SEMISYNC_SLAVE_SO;
+eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_SO';
 set global rpl_semi_sync_slave_enabled= 0;
 SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
 SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_event-master.opt b/mysql-test/suite/rpl/t/rpl_semi_sync_event-master.opt
index 3c4a05d640c..78be60a4852 100644
--- a/mysql-test/suite/rpl/t/rpl_semi_sync_event-master.opt
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_event-master.opt
@@ -1 +1 @@
-$SEMISYNC_PLUGIN_OPT --max-connections=23
+--max-connections=23
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_event-slave.opt b/mysql-test/suite/rpl/t/rpl_semi_sync_event-slave.opt
deleted file mode 100644
index 58029d28ace..00000000000
--- a/mysql-test/suite/rpl/t/rpl_semi_sync_event-slave.opt
+++ /dev/null
@@ -1 +0,0 @@
-$SEMISYNC_PLUGIN_OPT
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_event.test b/mysql-test/suite/rpl/t/rpl_semi_sync_event.test
index feb885ce07b..3b68441141a 100644
--- a/mysql-test/suite/rpl/t/rpl_semi_sync_event.test
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_event.test
@@ -23,7 +23,7 @@ let $value = query_get_value(show variables like 'rpl_semi_sync_master_enabled',
 if (`select '$value' = 'No such row'`)
 {
     set sql_log_bin=0;
-    eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
+    eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_SO';
     SET GLOBAL rpl_semi_sync_master_enabled = 1;
     set sql_log_bin=1;
 }
@@ -37,7 +37,7 @@ let $value= query_get_value(show variables like 'rpl_semi_sync_slave_enabled', V
 if (`select '$value' = 'No such row'`)
 {
     set sql_log_bin=0;
-    eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN';
+    eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_SO';
     SET GLOBAL rpl_semi_sync_slave_enabled = 1;
     set sql_log_bin=1;
 }
diff --git a/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test b/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test
index 87dd3eb3295..f3a4b174ab3 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test
@@ -6,4 +6,5 @@
 --source include/have_innodb.inc
 
 --let $engine=Innodb
+set session storage_engine=innodb;
 --source extra/rpl_tests/rpl_implicit_commit_binlog.test
diff --git a/mysql-test/suite/rpl/t/rpl_stm_maria.test b/mysql-test/suite/rpl/t/rpl_stm_maria.test
index b4dc0ef7e4a..6a37e390716 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_maria.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_maria.test
@@ -5,7 +5,7 @@
 --source include/master-slave.inc
 
 # Suppress warnings that rand() is unsafe in statement binlog mode
-CALL mtr.add_suppression('Statement may not be safe to log in statement format.');
+CALL mtr.add_suppression('Unsafe statement written to the binary log using statement format');
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;
diff --git a/mysql-test/suite/sys_vars/r/all_vars.result b/mysql-test/suite/sys_vars/r/all_vars.result
index 7f6dca3eb7b..0f741ff930a 100644
--- a/mysql-test/suite/sys_vars/r/all_vars.result
+++ b/mysql-test/suite/sys_vars/r/all_vars.result
@@ -10,7 +10,5 @@ There should be *no* long test name listed below:
 select 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:
-INNODB_FILE_FORMAT_MAX
-INNODB_FILE_FORMAT_MAX
 drop table t1;
 drop table t2;
diff --git a/mysql-test/suite/sys_vars/r/aria_block_size_basic.result b/mysql-test/suite/sys_vars/r/aria_block_size_basic.result
new file mode 100644
index 00000000000..ba7f494de1e
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_block_size_basic.result
@@ -0,0 +1,21 @@
+select @@global.aria_block_size;
+@@global.aria_block_size
+8192
+select @@session.aria_block_size;
+ERROR HY000: Variable 'aria_block_size' is a GLOBAL variable
+show global variables like 'aria_block_size';
+Variable_name	Value
+aria_block_size	8192
+show session variables like 'aria_block_size';
+Variable_name	Value
+aria_block_size	8192
+select * from information_schema.global_variables where variable_name='aria_block_size';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_BLOCK_SIZE	8192
+select * from information_schema.session_variables where variable_name='aria_block_size';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_BLOCK_SIZE	8192
+set global aria_block_size=1;
+ERROR HY000: Variable 'aria_block_size' is a read only variable
+set session aria_block_size=1;
+ERROR HY000: Variable 'aria_block_size' is a read only variable
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
new file mode 100644
index 00000000000..a49a5794f11
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_checkpoint_interval_basic.result
@@ -0,0 +1,41 @@
+SET @start_global_value = @@global.aria_checkpoint_interval;
+select @@global.aria_checkpoint_interval;
+@@global.aria_checkpoint_interval
+30
+select @@session.aria_checkpoint_interval;
+ERROR HY000: Variable 'aria_checkpoint_interval' is a GLOBAL variable
+show global variables like 'aria_checkpoint_interval';
+Variable_name	Value
+aria_checkpoint_interval	30
+show session variables like 'aria_checkpoint_interval';
+Variable_name	Value
+aria_checkpoint_interval	30
+select * from information_schema.global_variables where variable_name='aria_checkpoint_interval';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_CHECKPOINT_INTERVAL	30
+select * from information_schema.session_variables where variable_name='aria_checkpoint_interval';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_CHECKPOINT_INTERVAL	30
+set global aria_checkpoint_interval=1;
+select @@global.aria_checkpoint_interval;
+@@global.aria_checkpoint_interval
+1
+set session aria_checkpoint_interval=1;
+ERROR HY000: Variable 'aria_checkpoint_interval' is a GLOBAL variable and should be set with SET GLOBAL
+set global aria_checkpoint_interval=1.1;
+ERROR 42000: Incorrect argument type to variable 'aria_checkpoint_interval'
+set global aria_checkpoint_interval=1e1;
+ERROR 42000: Incorrect argument type to variable 'aria_checkpoint_interval'
+set global aria_checkpoint_interval="foo";
+ERROR 42000: Incorrect argument type to variable 'aria_checkpoint_interval'
+set global aria_checkpoint_interval=0;
+select @@global.aria_checkpoint_interval;
+@@global.aria_checkpoint_interval
+0
+set global aria_checkpoint_interval=cast(-1 as unsigned int);
+Warnings:
+Warning	1292	Truncated incorrect aria_checkpoint_interval value: '18446744073709551615'
+select @@global.aria_checkpoint_interval;
+@@global.aria_checkpoint_interval
+4294967295
+SET @@global.aria_checkpoint_interval = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/aria_force_start_after_recovery_failures_basic.result b/mysql-test/suite/sys_vars/r/aria_force_start_after_recovery_failures_basic.result
new file mode 100644
index 00000000000..be0056507a7
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_force_start_after_recovery_failures_basic.result
@@ -0,0 +1,21 @@
+select @@global.aria_force_start_after_recovery_failures;
+@@global.aria_force_start_after_recovery_failures
+0
+select @@session.aria_force_start_after_recovery_failures;
+ERROR HY000: Variable 'aria_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
+show session variables like 'aria_force_start_after_recovery_failures';
+Variable_name	Value
+aria_force_start_after_recovery_failures	0
+select * from information_schema.global_variables where variable_name='aria_force_start_after_recovery_failures';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_FORCE_START_AFTER_RECOVERY_FAILURES	0
+select * from information_schema.session_variables where variable_name='aria_force_start_after_recovery_failures';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_FORCE_START_AFTER_RECOVERY_FAILURES	0
+set global aria_force_start_after_recovery_failures=1;
+ERROR HY000: Variable 'aria_force_start_after_recovery_failures' is a read only variable
+set session aria_force_start_after_recovery_failures=1;
+ERROR HY000: Variable 'aria_force_start_after_recovery_failures' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/aria_group_commit_basic.result b/mysql-test/suite/sys_vars/r/aria_group_commit_basic.result
new file mode 100644
index 00000000000..fb6e887bb21
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_group_commit_basic.result
@@ -0,0 +1,45 @@
+SET @start_global_value = @@global.aria_group_commit;
+select @@global.aria_group_commit;
+@@global.aria_group_commit
+none
+select @@session.aria_group_commit;
+ERROR HY000: Variable 'aria_group_commit' is a GLOBAL variable
+show global variables like 'aria_group_commit';
+Variable_name	Value
+aria_group_commit	none
+show session variables like 'aria_group_commit';
+Variable_name	Value
+aria_group_commit	none
+select * from information_schema.global_variables where variable_name='aria_group_commit';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_GROUP_COMMIT	none
+select * from information_schema.session_variables where variable_name='aria_group_commit';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_GROUP_COMMIT	none
+set global aria_group_commit=1;
+select @@global.aria_group_commit;
+@@global.aria_group_commit
+hard
+set session aria_group_commit=1;
+ERROR HY000: Variable 'aria_group_commit' is a GLOBAL variable and should be set with SET GLOBAL
+set global aria_group_commit=none;
+select @@global.aria_group_commit;
+@@global.aria_group_commit
+none
+set global aria_group_commit=hard;
+select @@global.aria_group_commit;
+@@global.aria_group_commit
+hard
+set global aria_group_commit=soft;
+select @@global.aria_group_commit;
+@@global.aria_group_commit
+soft
+set global aria_group_commit=1.1;
+ERROR 42000: Incorrect argument type to variable 'aria_group_commit'
+set global aria_group_commit=1e1;
+ERROR 42000: Incorrect argument type to variable 'aria_group_commit'
+set global aria_group_commit="foo";
+ERROR 42000: Variable 'aria_group_commit' can't be set to the value of 'foo'
+set global aria_group_commit=3;
+ERROR 42000: Variable 'aria_group_commit' can't be set to the value of '3'
+SET @@global.aria_group_commit = @start_global_value;
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
new file mode 100644
index 00000000000..3cec802b3dd
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_group_commit_interval_basic.result
@@ -0,0 +1,41 @@
+SET @start_global_value = @@global.aria_group_commit_interval;
+select @@global.aria_group_commit_interval;
+@@global.aria_group_commit_interval
+0
+select @@session.aria_group_commit_interval;
+ERROR HY000: Variable 'aria_group_commit_interval' is a GLOBAL variable
+show global variables like 'aria_group_commit_interval';
+Variable_name	Value
+aria_group_commit_interval	0
+show session variables like 'aria_group_commit_interval';
+Variable_name	Value
+aria_group_commit_interval	0
+select * from information_schema.global_variables where variable_name='aria_group_commit_interval';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_GROUP_COMMIT_INTERVAL	0
+select * from information_schema.session_variables where variable_name='aria_group_commit_interval';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_GROUP_COMMIT_INTERVAL	0
+set global aria_group_commit_interval=1;
+select @@global.aria_group_commit_interval;
+@@global.aria_group_commit_interval
+1
+set session aria_group_commit_interval=1;
+ERROR HY000: Variable 'aria_group_commit_interval' is a GLOBAL variable and should be set with SET GLOBAL
+set global aria_group_commit_interval=1.1;
+ERROR 42000: Incorrect argument type to variable 'aria_group_commit_interval'
+set global aria_group_commit_interval=1e1;
+ERROR 42000: Incorrect argument type to variable 'aria_group_commit_interval'
+set global aria_group_commit_interval="foo";
+ERROR 42000: Incorrect argument type to variable 'aria_group_commit_interval'
+set global aria_group_commit_interval=0;
+select @@global.aria_group_commit_interval;
+@@global.aria_group_commit_interval
+0
+set global aria_group_commit_interval=cast(-1 as unsigned int);
+Warnings:
+Warning	1292	Truncated incorrect aria_group_commit_interval value: '18446744073709551615'
+select @@global.aria_group_commit_interval;
+@@global.aria_group_commit_interval
+4294967295
+SET @@global.aria_group_commit_interval = @start_global_value;
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
new file mode 100644
index 00000000000..ae823df4bf7
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_log_file_size_basic.result
@@ -0,0 +1,53 @@
+SET @start_global_value = @@global.aria_log_file_size;
+select @@global.aria_log_file_size;
+@@global.aria_log_file_size
+1073741824
+select @@session.aria_log_file_size;
+ERROR HY000: Variable 'aria_log_file_size' is a GLOBAL variable
+show global variables like 'aria_log_file_size';
+Variable_name	Value
+aria_log_file_size	1073741824
+show session variables like 'aria_log_file_size';
+Variable_name	Value
+aria_log_file_size	1073741824
+select * from information_schema.global_variables where variable_name='aria_log_file_size';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_LOG_FILE_SIZE	1073741824
+select * from information_schema.session_variables where variable_name='aria_log_file_size';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_LOG_FILE_SIZE	1073741824
+set global aria_log_file_size=1024*1024*10;
+select @@global.aria_log_file_size;
+@@global.aria_log_file_size
+10485760
+set session aria_log_file_size=1;
+ERROR HY000: Variable 'aria_log_file_size' is a GLOBAL variable and should be set with SET GLOBAL
+set global aria_log_file_size=1.1;
+ERROR 42000: Incorrect argument type to variable 'aria_log_file_size'
+set global aria_log_file_size=1e1;
+ERROR 42000: Incorrect argument type to variable 'aria_log_file_size'
+set global aria_log_file_size="foo";
+ERROR 42000: Incorrect argument type to variable 'aria_log_file_size'
+set global aria_log_file_size=1;
+Warnings:
+Warning	1292	Truncated incorrect aria_log_file_size value: '1'
+select @@global.aria_log_file_size;
+@@global.aria_log_file_size
+8388608
+set global aria_log_file_size=@@global.aria_log_file_size + 8192 - 1;
+Warnings:
+Warning	1292	Truncated incorrect aria_log_file_size value: '8396799'
+select @@global.aria_log_file_size;
+@@global.aria_log_file_size
+8388608
+set global aria_log_file_size=@@global.aria_log_file_size + 8192;
+select @@global.aria_log_file_size;
+@@global.aria_log_file_size
+8396800
+set global aria_log_file_size=cast(-1 as unsigned int);
+Warnings:
+Warning	1292	Truncated incorrect aria_log_file_size value: '18446744073709551615'
+select @@global.aria_log_file_size;
+@@global.aria_log_file_size
+4294959104
+SET @@global.aria_log_file_size = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/aria_log_purge_type_basic.result b/mysql-test/suite/sys_vars/r/aria_log_purge_type_basic.result
new file mode 100644
index 00000000000..1e6acad97d1
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_log_purge_type_basic.result
@@ -0,0 +1,45 @@
+SET @start_global_value = @@global.aria_log_purge_type;
+select @@global.aria_log_purge_type;
+@@global.aria_log_purge_type
+immediate
+select @@session.aria_log_purge_type;
+ERROR HY000: Variable 'aria_log_purge_type' is a GLOBAL variable
+show global variables like 'aria_log_purge_type';
+Variable_name	Value
+aria_log_purge_type	immediate
+show session variables like 'aria_log_purge_type';
+Variable_name	Value
+aria_log_purge_type	immediate
+select * from information_schema.global_variables where variable_name='aria_log_purge_type';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_LOG_PURGE_TYPE	immediate
+select * from information_schema.session_variables where variable_name='aria_log_purge_type';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_LOG_PURGE_TYPE	immediate
+set global aria_log_purge_type=1;
+select @@global.aria_log_purge_type;
+@@global.aria_log_purge_type
+external
+set session aria_log_purge_type=1;
+ERROR HY000: Variable 'aria_log_purge_type' is a GLOBAL variable and should be set with SET GLOBAL
+set global aria_log_purge_type=immediate;
+select @@global.aria_log_purge_type;
+@@global.aria_log_purge_type
+immediate
+set global aria_log_purge_type=external;
+select @@global.aria_log_purge_type;
+@@global.aria_log_purge_type
+external
+set global aria_log_purge_type=at_flush;
+select @@global.aria_log_purge_type;
+@@global.aria_log_purge_type
+at_flush
+set global aria_log_purge_type=1.1;
+ERROR 42000: Incorrect argument type to variable 'aria_log_purge_type'
+set global aria_log_purge_type=1e1;
+ERROR 42000: Incorrect argument type to variable 'aria_log_purge_type'
+set global aria_log_purge_type="foo";
+ERROR 42000: Variable 'aria_log_purge_type' can't be set to the value of 'foo'
+set global aria_log_purge_type=3;
+ERROR 42000: Variable 'aria_log_purge_type' can't be set to the value of '3'
+SET @@global.aria_log_purge_type = @start_global_value;
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
new file mode 100644
index 00000000000..83421bfc730
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_max_sort_file_size_basic.result
@@ -0,0 +1,53 @@
+SET @start_global_value = @@global.aria_max_sort_file_size;
+select @@global.aria_max_sort_file_size;
+@@global.aria_max_sort_file_size
+9223372036853727232
+select @@session.aria_max_sort_file_size;
+ERROR HY000: Variable 'aria_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
+show session variables like 'aria_max_sort_file_size';
+Variable_name	Value
+aria_max_sort_file_size	9223372036853727232
+select * from information_schema.global_variables where variable_name='aria_max_sort_file_size';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_MAX_SORT_FILE_SIZE	9223372036853727232
+select * from information_schema.session_variables where variable_name='aria_max_sort_file_size';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_MAX_SORT_FILE_SIZE	9223372036853727232
+set global aria_max_sort_file_size=1024*1024*10;
+select @@global.aria_max_sort_file_size;
+@@global.aria_max_sort_file_size
+10485760
+set session aria_max_sort_file_size=1;
+ERROR HY000: Variable 'aria_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
+set global aria_max_sort_file_size=1.1;
+ERROR 42000: Incorrect argument type to variable 'aria_max_sort_file_size'
+set global aria_max_sort_file_size=1e1;
+ERROR 42000: Incorrect argument type to variable 'aria_max_sort_file_size'
+set global aria_max_sort_file_size="foo";
+ERROR 42000: Incorrect argument type to variable 'aria_max_sort_file_size'
+set global aria_max_sort_file_size=1;
+Warnings:
+Warning	1292	Truncated incorrect aria_max_sort_file_size value: '1'
+select @@global.aria_max_sort_file_size;
+@@global.aria_max_sort_file_size
+0
+set global aria_max_sort_file_size=@@global.aria_max_sort_file_size + 1024*1024 - 1;
+Warnings:
+Warning	1292	Truncated incorrect aria_max_sort_file_size value: '1048575'
+select @@global.aria_max_sort_file_size;
+@@global.aria_max_sort_file_size
+0
+set global aria_max_sort_file_size=@@global.aria_max_sort_file_size + 1024*1024;
+select @@global.aria_max_sort_file_size;
+@@global.aria_max_sort_file_size
+1048576
+set global aria_max_sort_file_size=cast(-1 as unsigned int);
+Warnings:
+Warning	1292	Truncated incorrect aria_max_sort_file_size value: '18446744073709551615'
+select @@global.aria_max_sort_file_size;
+@@global.aria_max_sort_file_size
+9223372036853727232
+SET @@global.aria_max_sort_file_size = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/aria_page_checksum_basic.result b/mysql-test/suite/sys_vars/r/aria_page_checksum_basic.result
new file mode 100644
index 00000000000..4b30036a26a
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_page_checksum_basic.result
@@ -0,0 +1,39 @@
+SET @start_global_value = @@global.aria_page_checksum;
+select @@global.aria_page_checksum;
+@@global.aria_page_checksum
+1
+select @@session.aria_page_checksum;
+ERROR HY000: Variable 'aria_page_checksum' is a GLOBAL variable
+show global variables like 'aria_page_checksum';
+Variable_name	Value
+aria_page_checksum	ON
+show session variables like 'aria_page_checksum';
+Variable_name	Value
+aria_page_checksum	ON
+select * from information_schema.global_variables where variable_name='aria_page_checksum';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_PAGE_CHECKSUM	ON
+select * from information_schema.session_variables where variable_name='aria_page_checksum';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_PAGE_CHECKSUM	ON
+set global aria_page_checksum=ON;
+select @@global.aria_page_checksum;
+@@global.aria_page_checksum
+1
+set global aria_page_checksum=OFF;
+select @@global.aria_page_checksum;
+@@global.aria_page_checksum
+0
+set global aria_page_checksum=1;
+select @@global.aria_page_checksum;
+@@global.aria_page_checksum
+1
+set session aria_page_checksum=1;
+ERROR HY000: Variable 'aria_page_checksum' is a GLOBAL variable and should be set with SET GLOBAL
+set global aria_page_checksum=1.1;
+ERROR 42000: Incorrect argument type to variable 'aria_page_checksum'
+set global aria_page_checksum=1e1;
+ERROR 42000: Incorrect argument type to variable 'aria_page_checksum'
+set global aria_page_checksum="foo";
+ERROR 42000: Variable 'aria_page_checksum' can't be set to the value of 'foo'
+SET @@global.aria_page_checksum = @start_global_value;
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
new file mode 100644
index 00000000000..cd4fb0a3c26
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_pagecache_age_threshold_basic.result
@@ -0,0 +1,53 @@
+SET @start_global_value = @@global.aria_pagecache_age_threshold;
+select @@global.aria_pagecache_age_threshold;
+@@global.aria_pagecache_age_threshold
+300
+select @@session.aria_pagecache_age_threshold;
+ERROR HY000: Variable 'aria_pagecache_age_threshold' is a GLOBAL variable
+show global variables like 'aria_pagecache_age_threshold';
+Variable_name	Value
+aria_pagecache_age_threshold	300
+show session variables like 'aria_pagecache_age_threshold';
+Variable_name	Value
+aria_pagecache_age_threshold	300
+select * from information_schema.global_variables where variable_name='aria_pagecache_age_threshold';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_PAGECACHE_AGE_THRESHOLD	300
+select * from information_schema.session_variables where variable_name='aria_pagecache_age_threshold';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_PAGECACHE_AGE_THRESHOLD	300
+set global aria_pagecache_age_threshold=200;
+select @@global.aria_pagecache_age_threshold;
+@@global.aria_pagecache_age_threshold
+200
+set session aria_pagecache_age_threshold=1;
+ERROR HY000: Variable 'aria_pagecache_age_threshold' is a GLOBAL variable and should be set with SET GLOBAL
+set global aria_pagecache_age_threshold=1.1;
+ERROR 42000: Incorrect argument type to variable 'aria_pagecache_age_threshold'
+set global aria_pagecache_age_threshold=1e1;
+ERROR 42000: Incorrect argument type to variable 'aria_pagecache_age_threshold'
+set global aria_pagecache_age_threshold="foo";
+ERROR 42000: Incorrect argument type to variable 'aria_pagecache_age_threshold'
+set global aria_pagecache_age_threshold=1;
+Warnings:
+Warning	1292	Truncated incorrect aria_pagecache_age_threshold value: '1'
+select @@global.aria_pagecache_age_threshold;
+@@global.aria_pagecache_age_threshold
+100
+set global aria_pagecache_age_threshold=@@global.aria_pagecache_age_threshold + 100 - 1;
+Warnings:
+Warning	1292	Truncated incorrect aria_pagecache_age_threshold value: '199'
+select @@global.aria_pagecache_age_threshold;
+@@global.aria_pagecache_age_threshold
+100
+set global aria_pagecache_age_threshold=@@global.aria_pagecache_age_threshold + 100;
+select @@global.aria_pagecache_age_threshold;
+@@global.aria_pagecache_age_threshold
+200
+set global aria_pagecache_age_threshold=cast(-1 as unsigned int);
+Warnings:
+Warning	1292	Truncated incorrect aria_pagecache_age_threshold value: '18446744073709551615'
+select @@global.aria_pagecache_age_threshold;
+@@global.aria_pagecache_age_threshold
+18446744073709551600
+SET @@global.aria_pagecache_age_threshold = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/aria_pagecache_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/aria_pagecache_buffer_size_basic.result
new file mode 100644
index 00000000000..5f481b0b134
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_pagecache_buffer_size_basic.result
@@ -0,0 +1,21 @@
+select @@global.aria_pagecache_buffer_size;
+@@global.aria_pagecache_buffer_size
+134217728
+select @@session.aria_pagecache_buffer_size;
+ERROR HY000: Variable 'aria_pagecache_buffer_size' is a GLOBAL variable
+show global variables like 'aria_pagecache_buffer_size';
+Variable_name	Value
+aria_pagecache_buffer_size	134217728
+show session variables like 'aria_pagecache_buffer_size';
+Variable_name	Value
+aria_pagecache_buffer_size	134217728
+select * from information_schema.global_variables where variable_name='aria_pagecache_buffer_size';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_PAGECACHE_BUFFER_SIZE	134217728
+select * from information_schema.session_variables where variable_name='aria_pagecache_buffer_size';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_PAGECACHE_BUFFER_SIZE	134217728
+set global aria_pagecache_buffer_size=1;
+ERROR HY000: Variable 'aria_pagecache_buffer_size' is a read only variable
+set session aria_pagecache_buffer_size=1;
+ERROR HY000: Variable 'aria_pagecache_buffer_size' is a read only variable
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
new file mode 100644
index 00000000000..98aae5b3c01
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_pagecache_division_limit_basic.result
@@ -0,0 +1,43 @@
+SET @start_global_value = @@global.aria_pagecache_division_limit;
+select @@global.aria_pagecache_division_limit;
+@@global.aria_pagecache_division_limit
+100
+select @@session.aria_pagecache_division_limit;
+ERROR HY000: Variable 'aria_pagecache_division_limit' is a GLOBAL variable
+show global variables like 'aria_pagecache_division_limit';
+Variable_name	Value
+aria_pagecache_division_limit	100
+show session variables like 'aria_pagecache_division_limit';
+Variable_name	Value
+aria_pagecache_division_limit	100
+select * from information_schema.global_variables where variable_name='aria_pagecache_division_limit';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_PAGECACHE_DIVISION_LIMIT	100
+select * from information_schema.session_variables where variable_name='aria_pagecache_division_limit';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_PAGECACHE_DIVISION_LIMIT	100
+set global aria_pagecache_division_limit=20;
+select @@global.aria_pagecache_division_limit;
+@@global.aria_pagecache_division_limit
+20
+set session aria_pagecache_division_limit=1;
+ERROR HY000: Variable 'aria_pagecache_division_limit' is a GLOBAL variable and should be set with SET GLOBAL
+set global aria_pagecache_division_limit=1.1;
+ERROR 42000: Incorrect argument type to variable 'aria_pagecache_division_limit'
+set global aria_pagecache_division_limit=1e1;
+ERROR 42000: Incorrect argument type to variable 'aria_pagecache_division_limit'
+set global aria_pagecache_division_limit="foo";
+ERROR 42000: Incorrect argument type to variable 'aria_pagecache_division_limit'
+set global aria_pagecache_division_limit=0;
+Warnings:
+Warning	1292	Truncated incorrect aria_pagecache_division_limit value: '0'
+select @@global.aria_pagecache_division_limit;
+@@global.aria_pagecache_division_limit
+1
+set global aria_pagecache_division_limit=cast(-1 as unsigned int);
+Warnings:
+Warning	1292	Truncated incorrect aria_pagecache_division_limit value: '18446744073709551615'
+select @@global.aria_pagecache_division_limit;
+@@global.aria_pagecache_division_limit
+100
+SET @@global.aria_pagecache_division_limit = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/aria_recover_basic.result b/mysql-test/suite/sys_vars/r/aria_recover_basic.result
new file mode 100644
index 00000000000..ec275449c22
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_recover_basic.result
@@ -0,0 +1,53 @@
+SET @start_global_value = @@global.aria_recover;
+select @@global.aria_recover;
+@@global.aria_recover
+NORMAL
+select @@session.aria_recover;
+ERROR HY000: Variable 'aria_recover' is a GLOBAL variable
+show global variables like 'aria_recover';
+Variable_name	Value
+aria_recover	NORMAL
+show session variables like 'aria_recover';
+Variable_name	Value
+aria_recover	NORMAL
+select * from information_schema.global_variables where variable_name='aria_recover';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_RECOVER	NORMAL
+select * from information_schema.session_variables where variable_name='aria_recover';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_RECOVER	NORMAL
+set global aria_recover=1;
+select @@global.aria_recover;
+@@global.aria_recover
+NORMAL
+set session aria_recover=1;
+ERROR HY000: Variable 'aria_recover' is a GLOBAL variable and should be set with SET GLOBAL
+set global aria_recover=normal;
+select @@global.aria_recover;
+@@global.aria_recover
+NORMAL
+set global aria_recover=backup;
+select @@global.aria_recover;
+@@global.aria_recover
+BACKUP
+set global aria_recover='force';
+select @@global.aria_recover;
+@@global.aria_recover
+FORCE
+set global aria_recover='quick';
+select @@global.aria_recover;
+@@global.aria_recover
+QUICK
+set global aria_recover=off;
+select @@global.aria_recover;
+@@global.aria_recover
+OFF
+set global aria_recover=1.1;
+ERROR 42000: Incorrect argument type to variable 'aria_recover'
+set global aria_recover=1e1;
+ERROR 42000: Incorrect argument type to variable 'aria_recover'
+set global aria_recover="foo";
+ERROR 42000: Variable 'aria_recover' can't be set to the value of 'foo'
+set global aria_recover=5;
+ERROR 42000: Variable 'aria_recover' can't be set to the value of '5'
+SET @@global.aria_recover = @start_global_value;
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
new file mode 100644
index 00000000000..b070191e212
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_repair_threads_basic.result
@@ -0,0 +1,44 @@
+SET @start_global_value = @@global.aria_repair_threads;
+select @@global.aria_repair_threads;
+@@global.aria_repair_threads
+1
+select @@session.aria_repair_threads;
+@@session.aria_repair_threads
+1
+show global variables like 'aria_repair_threads';
+Variable_name	Value
+aria_repair_threads	1
+show session variables like 'aria_repair_threads';
+Variable_name	Value
+aria_repair_threads	1
+select * from information_schema.global_variables where variable_name='aria_repair_threads';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_REPAIR_THREADS	1
+select * from information_schema.session_variables where variable_name='aria_repair_threads';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_REPAIR_THREADS	1
+set global aria_repair_threads=10;
+select @@global.aria_repair_threads;
+@@global.aria_repair_threads
+10
+set session aria_repair_threads=10;
+select @@session.aria_repair_threads;
+@@session.aria_repair_threads
+10
+set global aria_repair_threads=1.1;
+ERROR 42000: Incorrect argument type to variable 'aria_repair_threads'
+set session aria_repair_threads=1e1;
+ERROR 42000: Incorrect argument type to variable 'aria_repair_threads'
+set global aria_repair_threads="foo";
+ERROR 42000: Incorrect argument type to variable 'aria_repair_threads'
+set global aria_repair_threads=0;
+Warnings:
+Warning	1292	Truncated incorrect aria_repair_threads value: '0'
+select @@global.aria_repair_threads;
+@@global.aria_repair_threads
+1
+set session aria_repair_threads=cast(-1 as unsigned int);
+select @@session.aria_repair_threads;
+@@session.aria_repair_threads
+18446744073709551615
+SET @@global.aria_repair_threads = @start_global_value;
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
new file mode 100644
index 00000000000..cf067c7e7b6
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result
@@ -0,0 +1,44 @@
+SET @start_global_value = @@global.aria_sort_buffer_size;
+select @@global.aria_sort_buffer_size;
+@@global.aria_sort_buffer_size
+134217728
+select @@session.aria_sort_buffer_size;
+@@session.aria_sort_buffer_size
+134217728
+show global variables like 'aria_sort_buffer_size';
+Variable_name	Value
+aria_sort_buffer_size	134217728
+show session variables like 'aria_sort_buffer_size';
+Variable_name	Value
+aria_sort_buffer_size	134217728
+select * from information_schema.global_variables where variable_name='aria_sort_buffer_size';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_SORT_BUFFER_SIZE	134217728
+select * from information_schema.session_variables where variable_name='aria_sort_buffer_size';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_SORT_BUFFER_SIZE	134217728
+set global aria_sort_buffer_size=10;
+select @@global.aria_sort_buffer_size;
+@@global.aria_sort_buffer_size
+10
+set session aria_sort_buffer_size=10;
+select @@session.aria_sort_buffer_size;
+@@session.aria_sort_buffer_size
+10
+set global aria_sort_buffer_size=1.1;
+ERROR 42000: Incorrect argument type to variable 'aria_sort_buffer_size'
+set session aria_sort_buffer_size=1e1;
+ERROR 42000: Incorrect argument type to variable 'aria_sort_buffer_size'
+set global aria_sort_buffer_size="foo";
+ERROR 42000: Incorrect argument type to variable 'aria_sort_buffer_size'
+set global aria_sort_buffer_size=0;
+Warnings:
+Warning	1292	Truncated incorrect aria_sort_buffer_size value: '0'
+select @@global.aria_sort_buffer_size;
+@@global.aria_sort_buffer_size
+4
+set session aria_sort_buffer_size=cast(-1 as unsigned int);
+select @@session.aria_sort_buffer_size;
+@@session.aria_sort_buffer_size
+18446744073709551615
+SET @@global.aria_sort_buffer_size = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/aria_stats_method_basic.result b/mysql-test/suite/sys_vars/r/aria_stats_method_basic.result
new file mode 100644
index 00000000000..4ebddcd36bc
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_stats_method_basic.result
@@ -0,0 +1,48 @@
+SET @start_global_value = @@global.aria_stats_method;
+select @@global.aria_stats_method;
+@@global.aria_stats_method
+nulls_unequal
+select @@session.aria_stats_method;
+@@session.aria_stats_method
+nulls_unequal
+show global variables like 'aria_stats_method';
+Variable_name	Value
+aria_stats_method	nulls_unequal
+show session variables like 'aria_stats_method';
+Variable_name	Value
+aria_stats_method	nulls_unequal
+select * from information_schema.global_variables where variable_name='aria_stats_method';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_STATS_METHOD	nulls_unequal
+select * from information_schema.session_variables where variable_name='aria_stats_method';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_STATS_METHOD	nulls_unequal
+set global aria_stats_method=1;
+select @@global.aria_stats_method;
+@@global.aria_stats_method
+nulls_equal
+set session aria_stats_method=1;
+select @@session.aria_stats_method;
+@@session.aria_stats_method
+nulls_equal
+set session aria_stats_method=nulls_unequal;
+select @@session.aria_stats_method;
+@@session.aria_stats_method
+nulls_unequal
+set session aria_stats_method=nulls_equal;
+select @@session.aria_stats_method;
+@@session.aria_stats_method
+nulls_equal
+set session aria_stats_method=nulls_ignored;
+select @@session.aria_stats_method;
+@@session.aria_stats_method
+nulls_ignored
+set session aria_stats_method=1.1;
+ERROR 42000: Incorrect argument type to variable 'aria_stats_method'
+set session aria_stats_method=1e1;
+ERROR 42000: Incorrect argument type to variable 'aria_stats_method'
+set session aria_stats_method="foo";
+ERROR 42000: Variable 'aria_stats_method' can't be set to the value of 'foo'
+set session aria_stats_method=3;
+ERROR 42000: Variable 'aria_stats_method' can't be set to the value of '3'
+SET @@global.aria_stats_method = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/aria_sync_log_dir_basic.result b/mysql-test/suite/sys_vars/r/aria_sync_log_dir_basic.result
new file mode 100644
index 00000000000..02bcee466ee
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_sync_log_dir_basic.result
@@ -0,0 +1,45 @@
+SET @start_global_value = @@global.aria_sync_log_dir;
+select @@global.aria_sync_log_dir;
+@@global.aria_sync_log_dir
+NEWFILE
+select @@session.aria_sync_log_dir;
+ERROR HY000: Variable 'aria_sync_log_dir' is a GLOBAL variable
+show global variables like 'aria_sync_log_dir';
+Variable_name	Value
+aria_sync_log_dir	NEWFILE
+show session variables like 'aria_sync_log_dir';
+Variable_name	Value
+aria_sync_log_dir	NEWFILE
+select * from information_schema.global_variables where variable_name='aria_sync_log_dir';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_SYNC_LOG_DIR	NEWFILE
+select * from information_schema.session_variables where variable_name='aria_sync_log_dir';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_SYNC_LOG_DIR	NEWFILE
+set global aria_sync_log_dir=1;
+select @@global.aria_sync_log_dir;
+@@global.aria_sync_log_dir
+NEWFILE
+set session aria_sync_log_dir=1;
+ERROR HY000: Variable 'aria_sync_log_dir' is a GLOBAL variable and should be set with SET GLOBAL
+set global aria_sync_log_dir=never;
+select @@global.aria_sync_log_dir;
+@@global.aria_sync_log_dir
+NEVER
+set global aria_sync_log_dir=newfile;
+select @@global.aria_sync_log_dir;
+@@global.aria_sync_log_dir
+NEWFILE
+set global aria_sync_log_dir=always;
+select @@global.aria_sync_log_dir;
+@@global.aria_sync_log_dir
+ALWAYS
+set global aria_sync_log_dir=1.1;
+ERROR 42000: Incorrect argument type to variable 'aria_sync_log_dir'
+set global aria_sync_log_dir=1e1;
+ERROR 42000: Incorrect argument type to variable 'aria_sync_log_dir'
+set global aria_sync_log_dir="foo";
+ERROR 42000: Variable 'aria_sync_log_dir' can't be set to the value of 'foo'
+set global aria_sync_log_dir=3;
+ERROR 42000: Variable 'aria_sync_log_dir' can't be set to the value of '3'
+SET @@global.aria_sync_log_dir = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/aria_used_for_temp_tables_basic.result b/mysql-test/suite/sys_vars/r/aria_used_for_temp_tables_basic.result
new file mode 100644
index 00000000000..4c2e2e74337
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/aria_used_for_temp_tables_basic.result
@@ -0,0 +1,21 @@
+select @@global.aria_used_for_temp_tables;
+@@global.aria_used_for_temp_tables
+1
+select @@session.aria_used_for_temp_tables;
+ERROR HY000: Variable 'aria_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
+show session variables like 'aria_used_for_temp_tables';
+Variable_name	Value
+aria_used_for_temp_tables	ON
+select * from information_schema.global_variables where variable_name='aria_used_for_temp_tables';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_USED_FOR_TEMP_TABLES	ON
+select * from information_schema.session_variables where variable_name='aria_used_for_temp_tables';
+VARIABLE_NAME	VARIABLE_VALUE
+ARIA_USED_FOR_TEMP_TABLES	ON
+set global aria_used_for_temp_tables=1;
+ERROR HY000: Variable 'aria_used_for_temp_tables' is a read only variable
+set session aria_used_for_temp_tables=1;
+ERROR HY000: Variable 'aria_used_for_temp_tables' is a read only variable
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
new file mode 100644
index 00000000000..7b51fa3614a
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/deadlock_search_depth_long_basic.result
@@ -0,0 +1,44 @@
+SET @start_global_value = @@global.deadlock_search_depth_long;
+select @@global.deadlock_search_depth_long;
+@@global.deadlock_search_depth_long
+15
+select @@session.deadlock_search_depth_long;
+@@session.deadlock_search_depth_long
+15
+show global variables like 'deadlock_search_depth_long';
+Variable_name	Value
+deadlock_search_depth_long	15
+show session variables like 'deadlock_search_depth_long';
+Variable_name	Value
+deadlock_search_depth_long	15
+select * from information_schema.global_variables where variable_name='deadlock_search_depth_long';
+VARIABLE_NAME	VARIABLE_VALUE
+DEADLOCK_SEARCH_DEPTH_LONG	15
+select * from information_schema.session_variables where variable_name='deadlock_search_depth_long';
+VARIABLE_NAME	VARIABLE_VALUE
+DEADLOCK_SEARCH_DEPTH_LONG	15
+set global deadlock_search_depth_long=10;
+select @@global.deadlock_search_depth_long;
+@@global.deadlock_search_depth_long
+10
+set session deadlock_search_depth_long=10;
+select @@session.deadlock_search_depth_long;
+@@session.deadlock_search_depth_long
+10
+set global deadlock_search_depth_long=1.1;
+ERROR 42000: Incorrect argument type to variable 'deadlock_search_depth_long'
+set session deadlock_search_depth_long=1e1;
+ERROR 42000: Incorrect argument type to variable 'deadlock_search_depth_long'
+set global deadlock_search_depth_long="foo";
+ERROR 42000: Incorrect argument type to variable 'deadlock_search_depth_long'
+set global deadlock_search_depth_long=0;
+select @@global.deadlock_search_depth_long;
+@@global.deadlock_search_depth_long
+0
+set session deadlock_search_depth_long=cast(-1 as unsigned int);
+Warnings:
+Warning	1292	Truncated incorrect deadlock_search_depth_long value: '18446744073709551615'
+select @@session.deadlock_search_depth_long;
+@@session.deadlock_search_depth_long
+33
+SET @@global.deadlock_search_depth_long = @start_global_value;
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
new file mode 100644
index 00000000000..5aab1253c27
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/deadlock_search_depth_short_basic.result
@@ -0,0 +1,44 @@
+SET @start_global_value = @@global.deadlock_search_depth_short;
+select @@global.deadlock_search_depth_short;
+@@global.deadlock_search_depth_short
+4
+select @@session.deadlock_search_depth_short;
+@@session.deadlock_search_depth_short
+4
+show global variables like 'deadlock_search_depth_short';
+Variable_name	Value
+deadlock_search_depth_short	4
+show session variables like 'deadlock_search_depth_short';
+Variable_name	Value
+deadlock_search_depth_short	4
+select * from information_schema.global_variables where variable_name='deadlock_search_depth_short';
+VARIABLE_NAME	VARIABLE_VALUE
+DEADLOCK_SEARCH_DEPTH_SHORT	4
+select * from information_schema.session_variables where variable_name='deadlock_search_depth_short';
+VARIABLE_NAME	VARIABLE_VALUE
+DEADLOCK_SEARCH_DEPTH_SHORT	4
+set global deadlock_search_depth_short=10;
+select @@global.deadlock_search_depth_short;
+@@global.deadlock_search_depth_short
+10
+set session deadlock_search_depth_short=10;
+select @@session.deadlock_search_depth_short;
+@@session.deadlock_search_depth_short
+10
+set global deadlock_search_depth_short=1.1;
+ERROR 42000: Incorrect argument type to variable 'deadlock_search_depth_short'
+set session deadlock_search_depth_short=1e1;
+ERROR 42000: Incorrect argument type to variable 'deadlock_search_depth_short'
+set global deadlock_search_depth_short="foo";
+ERROR 42000: Incorrect argument type to variable 'deadlock_search_depth_short'
+set global deadlock_search_depth_short=0;
+select @@global.deadlock_search_depth_short;
+@@global.deadlock_search_depth_short
+0
+set session deadlock_search_depth_short=cast(-1 as unsigned int);
+Warnings:
+Warning	1292	Truncated incorrect deadlock_search_depth_short value: '18446744073709551615'
+select @@session.deadlock_search_depth_short;
+@@session.deadlock_search_depth_short
+32
+SET @@global.deadlock_search_depth_short = @start_global_value;
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
new file mode 100644
index 00000000000..8f76c6d3344
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result
@@ -0,0 +1,42 @@
+SET @start_global_value = @@global.deadlock_timeout_long;
+select @@global.deadlock_timeout_long;
+@@global.deadlock_timeout_long
+50000000
+select @@session.deadlock_timeout_long;
+@@session.deadlock_timeout_long
+50000000
+show global variables like 'deadlock_timeout_long';
+Variable_name	Value
+deadlock_timeout_long	50000000
+show session variables like 'deadlock_timeout_long';
+Variable_name	Value
+deadlock_timeout_long	50000000
+select * from information_schema.global_variables where variable_name='deadlock_timeout_long';
+VARIABLE_NAME	VARIABLE_VALUE
+DEADLOCK_TIMEOUT_LONG	50000000
+select * from information_schema.session_variables where variable_name='deadlock_timeout_long';
+VARIABLE_NAME	VARIABLE_VALUE
+DEADLOCK_TIMEOUT_LONG	50000000
+set global deadlock_timeout_long=10;
+select @@global.deadlock_timeout_long;
+@@global.deadlock_timeout_long
+10
+set session deadlock_timeout_long=10;
+select @@session.deadlock_timeout_long;
+@@session.deadlock_timeout_long
+10
+set global deadlock_timeout_long=1.1;
+ERROR 42000: Incorrect argument type to variable 'deadlock_timeout_long'
+set session deadlock_timeout_long=1e1;
+ERROR 42000: Incorrect argument type to variable 'deadlock_timeout_long'
+set global deadlock_timeout_long="foo";
+ERROR 42000: Incorrect argument type to variable 'deadlock_timeout_long'
+set global deadlock_timeout_long=0;
+select @@global.deadlock_timeout_long;
+@@global.deadlock_timeout_long
+0
+set session deadlock_timeout_long=cast(-1 as unsigned int);
+select @@session.deadlock_timeout_long;
+@@session.deadlock_timeout_long
+18446744073709551615
+SET @@global.deadlock_timeout_long = @start_global_value;
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
new file mode 100644
index 00000000000..f2bf4132bf7
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result
@@ -0,0 +1,42 @@
+SET @start_global_value = @@global.deadlock_timeout_short;
+select @@global.deadlock_timeout_short;
+@@global.deadlock_timeout_short
+10000
+select @@session.deadlock_timeout_short;
+@@session.deadlock_timeout_short
+10000
+show global variables like 'deadlock_timeout_short';
+Variable_name	Value
+deadlock_timeout_short	10000
+show session variables like 'deadlock_timeout_short';
+Variable_name	Value
+deadlock_timeout_short	10000
+select * from information_schema.global_variables where variable_name='deadlock_timeout_short';
+VARIABLE_NAME	VARIABLE_VALUE
+DEADLOCK_TIMEOUT_SHORT	10000
+select * from information_schema.session_variables where variable_name='deadlock_timeout_short';
+VARIABLE_NAME	VARIABLE_VALUE
+DEADLOCK_TIMEOUT_SHORT	10000
+set global deadlock_timeout_short=10;
+select @@global.deadlock_timeout_short;
+@@global.deadlock_timeout_short
+10
+set session deadlock_timeout_short=10;
+select @@session.deadlock_timeout_short;
+@@session.deadlock_timeout_short
+10
+set global deadlock_timeout_short=1.1;
+ERROR 42000: Incorrect argument type to variable 'deadlock_timeout_short'
+set session deadlock_timeout_short=1e1;
+ERROR 42000: Incorrect argument type to variable 'deadlock_timeout_short'
+set global deadlock_timeout_short="foo";
+ERROR 42000: Incorrect argument type to variable 'deadlock_timeout_short'
+set global deadlock_timeout_short=0;
+select @@global.deadlock_timeout_short;
+@@global.deadlock_timeout_short
+0
+set session deadlock_timeout_short=cast(-1 as unsigned int);
+select @@session.deadlock_timeout_short;
+@@session.deadlock_timeout_short
+18446744073709551615
+SET @@global.deadlock_timeout_short = @start_global_value;
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
new file mode 100644
index 00000000000..70f338ad305
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/debug_crc_break_basic.result
@@ -0,0 +1,39 @@
+SET @start_global_value = @@global.debug_crc_break;
+select @@global.debug_crc_break;
+@@global.debug_crc_break
+0
+select @@session.debug_crc_break;
+ERROR HY000: Variable 'debug_crc_break' is a GLOBAL variable
+show global variables like 'debug_crc_break';
+Variable_name	Value
+debug_crc_break	0
+show session variables like 'debug_crc_break';
+Variable_name	Value
+debug_crc_break	0
+select * from information_schema.global_variables where variable_name='debug_crc_break';
+VARIABLE_NAME	VARIABLE_VALUE
+DEBUG_CRC_BREAK	0
+select * from information_schema.session_variables where variable_name='debug_crc_break';
+VARIABLE_NAME	VARIABLE_VALUE
+DEBUG_CRC_BREAK	0
+set global debug_crc_break=1;
+select @@global.debug_crc_break;
+@@global.debug_crc_break
+1
+set session debug_crc_break=1;
+ERROR HY000: Variable 'debug_crc_break' is a GLOBAL variable and should be set with SET GLOBAL
+set global debug_crc_break=1.1;
+ERROR 42000: Incorrect argument type to variable 'debug_crc_break'
+set global debug_crc_break=1e1;
+ERROR 42000: Incorrect argument type to variable 'debug_crc_break'
+set global debug_crc_break="foo";
+ERROR 42000: Incorrect argument type to variable 'debug_crc_break'
+set global debug_crc_break=0;
+select @@global.debug_crc_break;
+@@global.debug_crc_break
+0
+set global debug_crc_break=cast(-1 as unsigned int);
+select @@global.debug_crc_break;
+@@global.debug_crc_break
+18446744073709551615
+SET @@global.debug_crc_break = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/default_storage_engine_basic.result b/mysql-test/suite/sys_vars/r/default_storage_engine_basic.result
index c2acc7ab5ac..727e6ca88f2 100644
--- a/mysql-test/suite/sys_vars/r/default_storage_engine_basic.result
+++ b/mysql-test/suite/sys_vars/r/default_storage_engine_basic.result
@@ -1,11 +1,5 @@
 SET @start_global_value = @@global.default_storage_engine;
-SELECT @start_global_value;
-@start_global_value
-InnoDB
 SET @start_session_value = @@session.default_storage_engine;
-SELECT @start_session_value;
-@start_session_value
-InnoDB
 '#--------------------FN_DYNVARS_005_01-------------------------#'
 SET @@global.default_storage_engine = INNODB;
 SET @@global.default_storage_engine = DEFAULT;
@@ -108,10 +102,4 @@ SELECT default_storage_engine = @@session.default_storage_engine;
 ERROR 42S22: Unknown column 'default_storage_engine' in 'field list'
 SET @@default_storage_engine = @start_global_value;
 SET @@global.default_storage_engine = @start_global_value;
-SELECT @@global.default_storage_engine;
-@@global.default_storage_engine
-InnoDB
 SET @@session.default_storage_engine = @start_session_value;
-SELECT @@session.default_storage_engine;
-@@session.default_storage_engine
-InnoDB
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 2b0b57d5b33..6ae736d14e2 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
@@ -9,7 +9,7 @@ SELECT @global_start_value;
 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_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=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,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
 '#--------------------FN_DYNVARS_028_01------------------------#'
 SET @@session.engine_condition_pushdown = 0;
 Warnings:
@@ -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_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off
+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
 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_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off
+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
 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_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off
+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
 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_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on
+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
 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,31 +244,31 @@ 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_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off
+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
 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_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off
+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
 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_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off
+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
 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_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on
+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
 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_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off
+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
 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
@@ -287,4 +287,4 @@ 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_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on
+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
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
new file mode 100644
index 00000000000..353271cabb2
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/extra_max_connections_basic.result
@@ -0,0 +1,43 @@
+SET @start_global_value = @@global.extra_max_connections;
+select @@global.extra_max_connections;
+@@global.extra_max_connections
+1
+select @@session.extra_max_connections;
+ERROR HY000: Variable 'extra_max_connections' is a GLOBAL variable
+show global variables like 'extra_max_connections';
+Variable_name	Value
+extra_max_connections	1
+show session variables like 'extra_max_connections';
+Variable_name	Value
+extra_max_connections	1
+select * from information_schema.global_variables where variable_name='extra_max_connections';
+VARIABLE_NAME	VARIABLE_VALUE
+EXTRA_MAX_CONNECTIONS	1
+select * from information_schema.session_variables where variable_name='extra_max_connections';
+VARIABLE_NAME	VARIABLE_VALUE
+EXTRA_MAX_CONNECTIONS	1
+set global extra_max_connections=1;
+select @@global.extra_max_connections;
+@@global.extra_max_connections
+1
+set session extra_max_connections=1;
+ERROR HY000: Variable 'extra_max_connections' is a GLOBAL variable and should be set with SET GLOBAL
+set global extra_max_connections=1.1;
+ERROR 42000: Incorrect argument type to variable 'extra_max_connections'
+set global extra_max_connections=1e1;
+ERROR 42000: Incorrect argument type to variable 'extra_max_connections'
+set global extra_max_connections="foo";
+ERROR 42000: Incorrect argument type to variable 'extra_max_connections'
+set global extra_max_connections=0;
+Warnings:
+Warning	1292	Truncated incorrect extra_max_connections value: '0'
+select @@global.extra_max_connections;
+@@global.extra_max_connections
+1
+set global extra_max_connections=cast(-1 as unsigned int);
+Warnings:
+Warning	1292	Truncated incorrect extra_max_connections value: '18446744073709551615'
+select @@global.extra_max_connections;
+@@global.extra_max_connections
+100000
+SET @@global.extra_max_connections = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/extra_port_basic.result b/mysql-test/suite/sys_vars/r/extra_port_basic.result
new file mode 100644
index 00000000000..cbf6dbcb4f9
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/extra_port_basic.result
@@ -0,0 +1,21 @@
+select @@global.extra_port;
+@@global.extra_port
+0
+select @@session.extra_port;
+ERROR HY000: Variable 'extra_port' is a GLOBAL variable
+show global variables like 'extra_port';
+Variable_name	Value
+extra_port	0
+show session variables like 'extra_port';
+Variable_name	Value
+extra_port	0
+select * from information_schema.global_variables where variable_name='extra_port';
+VARIABLE_NAME	VARIABLE_VALUE
+EXTRA_PORT	0
+select * from information_schema.session_variables where variable_name='extra_port';
+VARIABLE_NAME	VARIABLE_VALUE
+EXTRA_PORT	0
+set global extra_port=1;
+ERROR HY000: Variable 'extra_port' is a read only variable
+set session extra_port=1;
+ERROR HY000: Variable 'extra_port' is a read only variable
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
new file mode 100644
index 00000000000..fecc886d460
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/join_cache_level_basic.result
@@ -0,0 +1,44 @@
+SET @start_global_value = @@global.join_cache_level;
+select @@global.join_cache_level;
+@@global.join_cache_level
+1
+select @@session.join_cache_level;
+@@session.join_cache_level
+1
+show global variables like 'join_cache_level';
+Variable_name	Value
+join_cache_level	1
+show session variables like 'join_cache_level';
+Variable_name	Value
+join_cache_level	1
+select * from information_schema.global_variables where variable_name='join_cache_level';
+VARIABLE_NAME	VARIABLE_VALUE
+JOIN_CACHE_LEVEL	1
+select * from information_schema.session_variables where variable_name='join_cache_level';
+VARIABLE_NAME	VARIABLE_VALUE
+JOIN_CACHE_LEVEL	1
+set global join_cache_level=4;
+select @@global.join_cache_level;
+@@global.join_cache_level
+4
+set session join_cache_level=4;
+select @@session.join_cache_level;
+@@session.join_cache_level
+4
+set global join_cache_level=1.1;
+ERROR 42000: Incorrect argument type to variable 'join_cache_level'
+set session join_cache_level=1e1;
+ERROR 42000: Incorrect argument type to variable 'join_cache_level'
+set global join_cache_level="foo";
+ERROR 42000: Incorrect argument type to variable 'join_cache_level'
+set global join_cache_level=0;
+select @@global.join_cache_level;
+@@global.join_cache_level
+0
+set session join_cache_level=cast(-1 as unsigned int);
+Warnings:
+Warning	1292	Truncated incorrect join_cache_level value: '18446744073709551615'
+select @@session.join_cache_level;
+@@session.join_cache_level
+8
+SET @@global.join_cache_level = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result
index 4612b5c7324..89aef2a3703 100644
--- a/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result
@@ -3,7 +3,7 @@ SET @start_value = @@global.key_buffer_size;
 SET @@global.key_buffer_size = DEFAULT;
 SELECT @@global.key_buffer_size;
 @@global.key_buffer_size
-8388608
+134217728
 '#---------------------FN_DYNVARS_055_02-------------------------#'
 SET @@global.key_buffer_size = @start_value;
 SELECT @@global.key_buffer_size = @start_value;
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
new file mode 100644
index 00000000000..55590b270e9
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/key_cache_segments_basic.result
@@ -0,0 +1,41 @@
+SET @start_global_value = @@global.key_cache_segments;
+select @@global.key_cache_segments;
+@@global.key_cache_segments
+0
+select @@session.key_cache_segments;
+ERROR HY000: Variable 'key_cache_segments' is a GLOBAL variable
+show global variables like 'key_cache_segments';
+Variable_name	Value
+key_cache_segments	0
+show session variables like 'key_cache_segments';
+Variable_name	Value
+key_cache_segments	0
+select * from information_schema.global_variables where variable_name='key_cache_segments';
+VARIABLE_NAME	VARIABLE_VALUE
+KEY_CACHE_SEGMENTS	0
+select * from information_schema.session_variables where variable_name='key_cache_segments';
+VARIABLE_NAME	VARIABLE_VALUE
+KEY_CACHE_SEGMENTS	0
+set global key_cache_segments=1;
+select @@global.key_cache_segments;
+@@global.key_cache_segments
+1
+set session key_cache_segments=1;
+ERROR HY000: Variable 'key_cache_segments' is a GLOBAL variable and should be set with SET GLOBAL
+set global key_cache_segments=1.1;
+ERROR 42000: Incorrect argument type to variable 'key_cache_segments'
+set global key_cache_segments=1e1;
+ERROR 42000: Incorrect argument type to variable 'key_cache_segments'
+set global key_cache_segments="foo";
+ERROR 42000: Incorrect argument type to variable 'key_cache_segments'
+set global key_cache_segments=0;
+select @@global.key_cache_segments;
+@@global.key_cache_segments
+0
+set global key_cache_segments=cast(-1 as unsigned int);
+Warnings:
+Warning	1292	Truncated incorrect key_cache_segments value: '18446744073709551615'
+select @@global.key_cache_segments;
+@@global.key_cache_segments
+64
+SET @@global.key_cache_segments = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result b/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result
new file mode 100644
index 00000000000..5b6eccf2185
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result
@@ -0,0 +1,96 @@
+SET @start_global_value = @@global.log_slow_filter;
+select @@global.log_slow_filter;
+@@global.log_slow_filter
+admin,filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+admin,filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
+show global variables like 'log_slow_filter';
+Variable_name	Value
+log_slow_filter	admin,filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
+show session variables like 'log_slow_filter';
+Variable_name	Value
+log_slow_filter	admin,filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
+select * from information_schema.global_variables where variable_name='log_slow_filter';
+VARIABLE_NAME	VARIABLE_VALUE
+LOG_SLOW_FILTER	admin,filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
+select * from information_schema.session_variables where variable_name='log_slow_filter';
+VARIABLE_NAME	VARIABLE_VALUE
+LOG_SLOW_FILTER	admin,filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
+set global log_slow_filter=1;
+select @@global.log_slow_filter;
+@@global.log_slow_filter
+admin
+set session log_slow_filter=1;
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+admin
+set session log_slow_filter=1;
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+admin
+set session log_slow_filter=2;
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+filesort
+set session log_slow_filter=5;
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+admin,filesort_on_disk
+set session log_slow_filter='admin';
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+admin
+set session log_slow_filter='filesort';
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+filesort
+set session log_slow_filter='filesort_on_disk';
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+filesort_on_disk
+set session log_slow_filter='full_join';
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+full_join
+set session log_slow_filter='full_scan';
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+full_scan
+set session log_slow_filter='query_cache';
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+query_cache
+set session log_slow_filter='query_cache_miss';
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+query_cache_miss
+set session log_slow_filter='tmp_table';
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+tmp_table
+set session log_slow_filter='tmp_table_on_disk';
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+tmp_table_on_disk
+set session log_slow_filter='filesort,query_cache';
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+filesort,query_cache
+set session log_slow_filter='admin,filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk';
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+admin,filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
+set session log_slow_filter='';
+select @@session.log_slow_filter;
+@@session.log_slow_filter
+
+set session log_slow_filter=1.1;
+ERROR 42000: Incorrect argument type to variable 'log_slow_filter'
+set session log_slow_filter=1e1;
+ERROR 42000: Incorrect argument type to variable 'log_slow_filter'
+set session log_slow_filter="foo";
+ERROR 42000: Variable 'log_slow_filter' can't be set to the value of 'foo'
+set session log_slow_filter=1024;
+ERROR 42000: Variable 'log_slow_filter' can't be set to the value of '1024'
+SET @@global.log_slow_filter = @start_global_value;
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
new file mode 100644
index 00000000000..ec47f5e0a30
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result
@@ -0,0 +1,44 @@
+SET @start_global_value = @@global.log_slow_rate_limit;
+select @@global.log_slow_rate_limit;
+@@global.log_slow_rate_limit
+1
+select @@session.log_slow_rate_limit;
+@@session.log_slow_rate_limit
+1
+show global variables like 'log_slow_rate_limit';
+Variable_name	Value
+log_slow_rate_limit	1
+show session variables like 'log_slow_rate_limit';
+Variable_name	Value
+log_slow_rate_limit	1
+select * from information_schema.global_variables where variable_name='log_slow_rate_limit';
+VARIABLE_NAME	VARIABLE_VALUE
+LOG_SLOW_RATE_LIMIT	1
+select * from information_schema.session_variables where variable_name='log_slow_rate_limit';
+VARIABLE_NAME	VARIABLE_VALUE
+LOG_SLOW_RATE_LIMIT	1
+set global log_slow_rate_limit=10;
+select @@global.log_slow_rate_limit;
+@@global.log_slow_rate_limit
+10
+set session log_slow_rate_limit=10;
+select @@session.log_slow_rate_limit;
+@@session.log_slow_rate_limit
+10
+set global log_slow_rate_limit=1.1;
+ERROR 42000: Incorrect argument type to variable 'log_slow_rate_limit'
+set session log_slow_rate_limit=1e1;
+ERROR 42000: Incorrect argument type to variable 'log_slow_rate_limit'
+set global log_slow_rate_limit="foo";
+ERROR 42000: Incorrect argument type to variable 'log_slow_rate_limit'
+set global log_slow_rate_limit=0;
+Warnings:
+Warning	1292	Truncated incorrect log_slow_rate_limit value: '0'
+select @@global.log_slow_rate_limit;
+@@global.log_slow_rate_limit
+1
+set session log_slow_rate_limit=cast(-1 as unsigned int);
+select @@session.log_slow_rate_limit;
+@@session.log_slow_rate_limit
+18446744073709551615
+SET @@global.log_slow_rate_limit = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result b/mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result
new file mode 100644
index 00000000000..24b805d4d9c
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result
@@ -0,0 +1,64 @@
+SET @start_global_value = @@global.log_slow_verbosity;
+select @@global.log_slow_verbosity;
+@@global.log_slow_verbosity
+
+select @@session.log_slow_verbosity;
+@@session.log_slow_verbosity
+
+show global variables like 'log_slow_verbosity';
+Variable_name	Value
+log_slow_verbosity	
+show session variables like 'log_slow_verbosity';
+Variable_name	Value
+log_slow_verbosity	
+select * from information_schema.global_variables where variable_name='log_slow_verbosity';
+VARIABLE_NAME	VARIABLE_VALUE
+LOG_SLOW_VERBOSITY	
+select * from information_schema.session_variables where variable_name='log_slow_verbosity';
+VARIABLE_NAME	VARIABLE_VALUE
+LOG_SLOW_VERBOSITY	
+set global log_slow_verbosity=1;
+select @@global.log_slow_verbosity;
+@@global.log_slow_verbosity
+innodb
+set session log_slow_verbosity=1;
+select @@session.log_slow_verbosity;
+@@session.log_slow_verbosity
+innodb
+set session log_slow_verbosity=1;
+select @@session.log_slow_verbosity;
+@@session.log_slow_verbosity
+innodb
+set session log_slow_verbosity=2;
+select @@session.log_slow_verbosity;
+@@session.log_slow_verbosity
+query_plan
+set session log_slow_verbosity=3;
+select @@session.log_slow_verbosity;
+@@session.log_slow_verbosity
+innodb,query_plan
+set session log_slow_verbosity='innodb';
+select @@session.log_slow_verbosity;
+@@session.log_slow_verbosity
+innodb
+set session log_slow_verbosity='query_plan';
+select @@session.log_slow_verbosity;
+@@session.log_slow_verbosity
+query_plan
+set session log_slow_verbosity='innodb,query_plan';
+select @@session.log_slow_verbosity;
+@@session.log_slow_verbosity
+innodb,query_plan
+set session log_slow_verbosity='';
+select @@session.log_slow_verbosity;
+@@session.log_slow_verbosity
+
+set session log_slow_verbosity=1.1;
+ERROR 42000: Incorrect argument type to variable 'log_slow_verbosity'
+set session log_slow_verbosity=1e1;
+ERROR 42000: Incorrect argument type to variable 'log_slow_verbosity'
+set session log_slow_verbosity="foo";
+ERROR 42000: Variable 'log_slow_verbosity' can't be set to the value of 'foo'
+set session log_slow_verbosity=4;
+ERROR 42000: Variable 'log_slow_verbosity' can't be set to the value of '4'
+SET @@global.log_slow_verbosity = @start_global_value;
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
new file mode 100644
index 00000000000..a0842541534
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_block_size_basic.result
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 00000000000..0a60303c7d5
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_checkpoint_interval_basic.result
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 00000000000..f4bbd134df3
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_force_start_after_recovery_failures_basic.result
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 00000000000..7e97d379403
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_group_commit_basic.result
@@ -0,0 +1,47 @@
+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
new file mode 100644
index 00000000000..23ae3ac7e82
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_group_commit_interval_basic.result
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 00000000000..33945ab1ae7
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_log_file_size_basic.result
@@ -0,0 +1,57 @@
+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
new file mode 100644
index 00000000000..519c41ae46d
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_log_purge_type_basic.result
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000000..1e11f8ee5a9
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_max_sort_file_size_basic.result
@@ -0,0 +1,57 @@
+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
new file mode 100644
index 00000000000..01cb1ea9a9d
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_page_checksum_basic.result
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 00000000000..c00bbfb1adf
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_pagecache_age_threshold_basic.result
@@ -0,0 +1,57 @@
+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
new file mode 100644
index 00000000000..a2b98f6d536
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_pagecache_buffer_size_basic.result
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 00000000000..46fbb93e81b
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_pagecache_division_limit_basic.result
@@ -0,0 +1,47 @@
+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
new file mode 100644
index 00000000000..53a215d69c3
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_recover_basic.result
@@ -0,0 +1,57 @@
+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
new file mode 100644
index 00000000000..0e0610953c9
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_repair_threads_basic.result
@@ -0,0 +1,48 @@
+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
new file mode 100644
index 00000000000..42ddaa05c16
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_sort_buffer_size_basic.result
@@ -0,0 +1,48 @@
+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
new file mode 100644
index 00000000000..7b3b2015db3
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_stats_method_basic.result
@@ -0,0 +1,52 @@
+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
new file mode 100644
index 00000000000..456a0ddb970
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_sync_log_dir_basic.result
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000000..8795e0f128b
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/maria_used_for_temp_tables_basic.result
@@ -0,0 +1,25 @@
+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/mrr_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/mrr_buffer_size_basic.result
new file mode 100644
index 00000000000..9c358de69a5
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/mrr_buffer_size_basic.result
@@ -0,0 +1,50 @@
+SET @start_global_value = @@global.mrr_buffer_size;
+select @@global.mrr_buffer_size;
+@@global.mrr_buffer_size
+262144
+select @@session.mrr_buffer_size;
+@@session.mrr_buffer_size
+262144
+show global variables like 'mrr_buffer_size';
+Variable_name	Value
+mrr_buffer_size	262144
+show session variables like 'mrr_buffer_size';
+Variable_name	Value
+mrr_buffer_size	262144
+select * from information_schema.global_variables where variable_name='mrr_buffer_size';
+VARIABLE_NAME	VARIABLE_VALUE
+MRR_BUFFER_SIZE	262144
+select * from information_schema.session_variables where variable_name='mrr_buffer_size';
+VARIABLE_NAME	VARIABLE_VALUE
+MRR_BUFFER_SIZE	262144
+set global mrr_buffer_size=10;
+Warnings:
+Warning	1292	Truncated incorrect mrr_buffer_size value: '10'
+select @@global.mrr_buffer_size;
+@@global.mrr_buffer_size
+8192
+set session mrr_buffer_size=10;
+Warnings:
+Warning	1292	Truncated incorrect mrr_buffer_size value: '10'
+select @@session.mrr_buffer_size;
+@@session.mrr_buffer_size
+8192
+set global mrr_buffer_size=1.1;
+ERROR 42000: Incorrect argument type to variable 'mrr_buffer_size'
+set session mrr_buffer_size=1e1;
+ERROR 42000: Incorrect argument type to variable 'mrr_buffer_size'
+set global mrr_buffer_size="foo";
+ERROR 42000: Incorrect argument type to variable 'mrr_buffer_size'
+set global mrr_buffer_size=0;
+Warnings:
+Warning	1292	Truncated incorrect mrr_buffer_size value: '0'
+select @@global.mrr_buffer_size;
+@@global.mrr_buffer_size
+8192
+set session mrr_buffer_size=cast(-1 as unsigned int);
+Warnings:
+Warning	1292	Truncated incorrect mrr_buffer_size value: '18446744073709551615'
+select @@session.mrr_buffer_size;
+@@session.mrr_buffer_size
+2147483647
+SET @@global.mrr_buffer_size = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/mutex_deadlock_detector_basic.result b/mysql-test/suite/sys_vars/r/mutex_deadlock_detector_basic.result
new file mode 100644
index 00000000000..a43c194e3f9
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/mutex_deadlock_detector_basic.result
@@ -0,0 +1,21 @@
+select @@global.mutex_deadlock_detector;
+@@global.mutex_deadlock_detector
+1
+select @@session.mutex_deadlock_detector;
+ERROR HY000: Variable 'mutex_deadlock_detector' is a GLOBAL variable
+show global variables like 'mutex_deadlock_detector';
+Variable_name	Value
+mutex_deadlock_detector	ON
+show session variables like 'mutex_deadlock_detector';
+Variable_name	Value
+mutex_deadlock_detector	ON
+select * from information_schema.global_variables where variable_name='mutex_deadlock_detector';
+VARIABLE_NAME	VARIABLE_VALUE
+MUTEX_DEADLOCK_DETECTOR	ON
+select * from information_schema.session_variables where variable_name='mutex_deadlock_detector';
+VARIABLE_NAME	VARIABLE_VALUE
+MUTEX_DEADLOCK_DETECTOR	ON
+set global mutex_deadlock_detector=1;
+ERROR HY000: Variable 'mutex_deadlock_detector' is a read only variable
+set session mutex_deadlock_detector=1;
+ERROR HY000: Variable 'mutex_deadlock_detector' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/myisam_recover_options_basic.result b/mysql-test/suite/sys_vars/r/myisam_recover_options_basic.result
index 22384d3c6ef..3fc0f563298 100644
--- a/mysql-test/suite/sys_vars/r/myisam_recover_options_basic.result
+++ b/mysql-test/suite/sys_vars/r/myisam_recover_options_basic.result
@@ -1,20 +1,20 @@
 select @@global.myisam_recover_options;
 @@global.myisam_recover_options
-OFF
+DEFAULT
 select @@session.myisam_recover_options;
 ERROR HY000: Variable 'myisam_recover_options' is a GLOBAL variable
 show global variables like 'myisam_recover_options';
 Variable_name	Value
-myisam_recover_options	OFF
+myisam_recover_options	DEFAULT
 show session variables like 'myisam_recover_options';
 Variable_name	Value
-myisam_recover_options	OFF
+myisam_recover_options	DEFAULT
 select * from information_schema.global_variables where variable_name='myisam_recover_options';
 VARIABLE_NAME	VARIABLE_VALUE
-MYISAM_RECOVER_OPTIONS	OFF
+MYISAM_RECOVER_OPTIONS	DEFAULT
 select * from information_schema.session_variables where variable_name='myisam_recover_options';
 VARIABLE_NAME	VARIABLE_VALUE
-MYISAM_RECOVER_OPTIONS	OFF
+MYISAM_RECOVER_OPTIONS	DEFAULT
 set global myisam_recover_options=1;
 ERROR HY000: Variable 'myisam_recover_options' is a read only variable
 set session myisam_recover_options=1;
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 acc8cd699f8..cab81890503 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_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
 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_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
 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_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
 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
+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
 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
+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
 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
+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
 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
+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
 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_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
 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_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
 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_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
 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_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
 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
+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
 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
+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
 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
+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
 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
+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
 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_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
 set global optimizer_switch=1.1;
 ERROR 42000: Incorrect argument type to variable 'optimizer_switch'
 set global optimizer_switch=1e1;
@@ -63,4 +63,4 @@ ERROR 42000: Variable 'optimizer_switch' can't be set to the value of 'foobar'
 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_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
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
new file mode 100644
index 00000000000..45a7d83c2ad
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/optimizer_use_mrr_basic.result
@@ -0,0 +1,48 @@
+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/plugin_dir_basic.result b/mysql-test/suite/sys_vars/r/plugin_dir_basic.result
index f81cae24dda..c18f4cd2a1d 100644
--- a/mysql-test/suite/sys_vars/r/plugin_dir_basic.result
+++ b/mysql-test/suite/sys_vars/r/plugin_dir_basic.result
@@ -1,20 +1,20 @@
 select @@global.plugin_dir;
 @@global.plugin_dir
-MYSQL_LIBDIR/plugin
+MYSQL_LIBDIR/plugins
 select @@session.plugin_dir;
 ERROR HY000: Variable 'plugin_dir' is a GLOBAL variable
 show global variables like 'plugin_dir';
 Variable_name	Value
-plugin_dir	MYSQL_LIBDIR/plugin
+plugin_dir	MYSQL_LIBDIR/plugins
 show session variables like 'plugin_dir';
 Variable_name	Value
-plugin_dir	MYSQL_LIBDIR/plugin
+plugin_dir	MYSQL_LIBDIR/plugins
 select * from information_schema.global_variables where variable_name='plugin_dir';
 VARIABLE_NAME	VARIABLE_VALUE
-PLUGIN_DIR	MYSQL_LIBDIR/plugin
+PLUGIN_DIR	MYSQL_LIBDIR/plugins
 select * from information_schema.session_variables where variable_name='plugin_dir';
 VARIABLE_NAME	VARIABLE_VALUE
-PLUGIN_DIR	MYSQL_LIBDIR/plugin
+PLUGIN_DIR	MYSQL_LIBDIR/plugins
 set global plugin_dir=1;
 ERROR HY000: Variable 'plugin_dir' is a read only variable
 set session plugin_dir=1;
diff --git a/mysql-test/suite/sys_vars/r/plugin_maturity_basic.result b/mysql-test/suite/sys_vars/r/plugin_maturity_basic.result
new file mode 100644
index 00000000000..e088361563e
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/plugin_maturity_basic.result
@@ -0,0 +1,21 @@
+select @@global.plugin_maturity;
+@@global.plugin_maturity
+unknown
+select @@session.plugin_maturity;
+ERROR HY000: Variable 'plugin_maturity' is a GLOBAL variable
+show global variables like 'plugin_maturity';
+Variable_name	Value
+plugin_maturity	unknown
+show session variables like 'plugin_maturity';
+Variable_name	Value
+plugin_maturity	unknown
+select * from information_schema.global_variables where variable_name='plugin_maturity';
+VARIABLE_NAME	VARIABLE_VALUE
+PLUGIN_MATURITY	unknown
+select * from information_schema.session_variables where variable_name='plugin_maturity';
+VARIABLE_NAME	VARIABLE_VALUE
+PLUGIN_MATURITY	unknown
+set global plugin_maturity=1;
+ERROR HY000: Variable 'plugin_maturity' is a read only variable
+set session plugin_maturity=1;
+ERROR HY000: Variable 'plugin_maturity' is a read only variable
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
new file mode 100644
index 00000000000..222500dabda
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/rowid_merge_buff_size_basic.result
@@ -0,0 +1,44 @@
+SET @start_global_value = @@global.rowid_merge_buff_size;
+select @@global.rowid_merge_buff_size;
+@@global.rowid_merge_buff_size
+8388608
+select @@session.rowid_merge_buff_size;
+@@session.rowid_merge_buff_size
+8388608
+show global variables like 'rowid_merge_buff_size';
+Variable_name	Value
+rowid_merge_buff_size	8388608
+show session variables like 'rowid_merge_buff_size';
+Variable_name	Value
+rowid_merge_buff_size	8388608
+select * from information_schema.global_variables where variable_name='rowid_merge_buff_size';
+VARIABLE_NAME	VARIABLE_VALUE
+ROWID_MERGE_BUFF_SIZE	8388608
+select * from information_schema.session_variables where variable_name='rowid_merge_buff_size';
+VARIABLE_NAME	VARIABLE_VALUE
+ROWID_MERGE_BUFF_SIZE	8388608
+set global rowid_merge_buff_size=10;
+select @@global.rowid_merge_buff_size;
+@@global.rowid_merge_buff_size
+10
+set session rowid_merge_buff_size=10;
+select @@session.rowid_merge_buff_size;
+@@session.rowid_merge_buff_size
+10
+set global rowid_merge_buff_size=1.1;
+ERROR 42000: Incorrect argument type to variable 'rowid_merge_buff_size'
+set session rowid_merge_buff_size=1e1;
+ERROR 42000: Incorrect argument type to variable 'rowid_merge_buff_size'
+set global rowid_merge_buff_size="foo";
+ERROR 42000: Incorrect argument type to variable 'rowid_merge_buff_size'
+set global rowid_merge_buff_size=0;
+select @@global.rowid_merge_buff_size;
+@@global.rowid_merge_buff_size
+0
+set session rowid_merge_buff_size=cast(-1 as unsigned int);
+Warnings:
+Warning	1292	Truncated incorrect rowid_merge_buff_size value: '18446744073709551615'
+select @@session.rowid_merge_buff_size;
+@@session.rowid_merge_buff_size
+9223372036854775807
+SET @@global.rowid_merge_buff_size = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/sql_mode_basic.result b/mysql-test/suite/sys_vars/r/sql_mode_basic.result
index 19695fd3af6..df5f38c8b12 100644
--- a/mysql-test/suite/sys_vars/r/sql_mode_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_mode_basic.result
@@ -357,7 +357,7 @@ REAL_AS_FLOAT,PIPES_AS_CONCAT
 SET @@global.sql_mode = 50000;
 SELECT @@global.sql_mode;
 @@global.sql_mode
-PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,,,NO_UNSIGNED_SUBTRACTION,POSTGRESQL,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER
+PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,IGNORE_BAD_TABLE_OPTIONS,NO_UNSIGNED_SUBTRACTION,POSTGRESQL,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER
 SET @@global.sql_mode = 500000;
 SELECT @@global.sql_mode;
 @@global.sql_mode
@@ -365,7 +365,7 @@ REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ONLY_FULL_GROUP_BY,POSTGR
 SET @@global.sql_mode = 4294967295;
 SELECT @@global.sql_mode;
 @@global.sql_mode
-REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,,,ONLY_FULL_GROUP_BY,NO_UNSIGNED_SUBTRACTION,NO_DIR_IN_CREATE,POSTGRESQL,ORACLE,MSSQL,DB2,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,MYSQL323,MYSQL40,ANSI,NO_AUTO_VALUE_ON_ZERO,NO_BACKSLASH_ESCAPES,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ALLOW_INVALID_DATES,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER,HIGH_NOT_PRECEDENCE,NO_ENGINE_SUBSTITUTION,PAD_CHAR_TO_FULL_LENGTH
+REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,IGNORE_BAD_TABLE_OPTIONS,ONLY_FULL_GROUP_BY,NO_UNSIGNED_SUBTRACTION,NO_DIR_IN_CREATE,POSTGRESQL,ORACLE,MSSQL,DB2,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,MYSQL323,MYSQL40,ANSI,NO_AUTO_VALUE_ON_ZERO,NO_BACKSLASH_ESCAPES,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ALLOW_INVALID_DATES,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER,HIGH_NOT_PRECEDENCE,NO_ENGINE_SUBSTITUTION,PAD_CHAR_TO_FULL_LENGTH
 SET @@global.sql_mode = 4294967296;
 ERROR 42000: Variable 'sql_mode' can't be set to the value of '4294967296'
 SET @@global.sql_mode = 0.4;
diff --git a/mysql-test/suite/sys_vars/r/storage_engine_basic.result b/mysql-test/suite/sys_vars/r/storage_engine_basic.result
index 6f10ec475a0..2831ebaa500 100644
--- a/mysql-test/suite/sys_vars/r/storage_engine_basic.result
+++ b/mysql-test/suite/sys_vars/r/storage_engine_basic.result
@@ -1,11 +1,5 @@
 SET @start_global_value = @@global.storage_engine;
-SELECT @start_global_value;
-@start_global_value
-InnoDB
 SET @start_session_value = @@session.storage_engine;
-SELECT @start_session_value;
-@start_session_value
-InnoDB
 '#--------------------FN_DYNVARS_005_01-------------------------#'
 SET @@global.storage_engine = INNODB;
 SET @@global.storage_engine = DEFAULT;
@@ -108,10 +102,4 @@ SELECT storage_engine = @@session.storage_engine;
 ERROR 42S22: Unknown column 'storage_engine' in 'field list'
 SET @@storage_engine = @start_global_value;
 SET @@global.storage_engine = @start_global_value;
-SELECT @@global.storage_engine;
-@@global.storage_engine
-InnoDB
 SET @@session.storage_engine = @start_session_value;
-SELECT @@session.storage_engine;
-@@session.storage_engine
-InnoDB
diff --git a/mysql-test/suite/sys_vars/r/thread_stack_basic.result b/mysql-test/suite/sys_vars/r/thread_stack_basic.result
index c9c458a28a9..4d974f66a00 100644
--- a/mysql-test/suite/sys_vars/r/thread_stack_basic.result
+++ b/mysql-test/suite/sys_vars/r/thread_stack_basic.result
@@ -1,20 +1,20 @@
 select @@global.thread_stack;
 @@global.thread_stack
-262144
+294912
 select @@session.thread_stack;
 ERROR HY000: Variable 'thread_stack' is a GLOBAL variable
 show global variables like 'thread_stack';
 Variable_name	Value
-thread_stack	262144
+thread_stack	294912
 show session variables like 'thread_stack';
 Variable_name	Value
-thread_stack	262144
+thread_stack	294912
 select * from information_schema.global_variables where variable_name='thread_stack';
 VARIABLE_NAME	VARIABLE_VALUE
-THREAD_STACK	262144
+THREAD_STACK	294912
 select * from information_schema.session_variables where variable_name='thread_stack';
 VARIABLE_NAME	VARIABLE_VALUE
-THREAD_STACK	262144
+THREAD_STACK	294912
 set global thread_stack=1;
 ERROR HY000: Variable 'thread_stack' is a read only variable
 set session thread_stack=1;
diff --git a/mysql-test/suite/sys_vars/r/userstat_basic.result b/mysql-test/suite/sys_vars/r/userstat_basic.result
new file mode 100644
index 00000000000..2d082cd3a25
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/userstat_basic.result
@@ -0,0 +1,39 @@
+SET @start_global_value = @@global.userstat;
+select @@global.userstat;
+@@global.userstat
+0
+select @@session.userstat;
+ERROR HY000: Variable 'userstat' is a GLOBAL variable
+show global variables like 'userstat';
+Variable_name	Value
+userstat	OFF
+show session variables like 'userstat';
+Variable_name	Value
+userstat	OFF
+select * from information_schema.global_variables where variable_name='userstat';
+VARIABLE_NAME	VARIABLE_VALUE
+USERSTAT	OFF
+select * from information_schema.session_variables where variable_name='userstat';
+VARIABLE_NAME	VARIABLE_VALUE
+USERSTAT	OFF
+set global userstat=ON;
+select @@global.userstat;
+@@global.userstat
+1
+set global userstat=OFF;
+select @@global.userstat;
+@@global.userstat
+0
+set global userstat=1;
+select @@global.userstat;
+@@global.userstat
+1
+set session userstat=1;
+ERROR HY000: Variable 'userstat' is a GLOBAL variable and should be set with SET GLOBAL
+set global userstat=1.1;
+ERROR 42000: Incorrect argument type to variable 'userstat'
+set global userstat=1e1;
+ERROR 42000: Incorrect argument type to variable 'userstat'
+set global userstat="foo";
+ERROR 42000: Variable 'userstat' can't be set to the value of 'foo'
+SET @@global.userstat = @start_global_value;
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 3eec696ce86..48457b17309 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 @@
-$SEMISYNC_PLUGIN_OPT --loose-innodb
+--loose-innodb
diff --git a/mysql-test/suite/sys_vars/t/all_vars.test b/mysql-test/suite/sys_vars/t/all_vars.test
index e9e7e16687a..74430787c26 100644
--- a/mysql-test/suite/sys_vars/t/all_vars.test
+++ b/mysql-test/suite/sys_vars/t/all_vars.test
@@ -15,24 +15,23 @@
 
 --source include/not_embedded.inc
 
-# 2010-01-28 OBN Added support to load 'innodb' and 'semisync' if possible.
-# As we need to have there variables loaded if the components exist but do 
-# not want the test skiped if they are not, we cannot use the 'have_xxx' mecanizm.
-# Added an 'all_vars-master.opt' file that includes
-# "$SEMISYNC_PLUGIN_OPT --loose-innodb" (see $SEMISYNC_PLUGIN_OPT setting in mysql-test-run.pl)
-# and logic similar to 'include/have_semisync_plugin.inc' that will load semisync plugin
-if (`SELECT @@have_dynamic_loading = 'YES' AND LENGTH('$SEMISYNC_MASTER_PLUGIN') > 0`)
-{
-  --disable_query_log
-  # The following is to prevent a mis-match on windows that has the name of of the lib ending with 'dll' 
-  --replace_regex /\.dll/.so/
-  eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
-  --replace_regex /\.dll/.so/
-  eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN';
-  --enable_query_log
-}
-
-
+#
+# load everything we want to include in the testing
+#
+--disable_query_log
+--disable_result_log
+--disable_abort_on_error
+eval INSTALL PLUGIN archive SONAME "$HA_ARCHIVE_SO";
+eval INSTALL PLUGIN blackhole SONAME "$HA_BLACKHOLE_SO";
+eval INSTALL PLUGIN federated SONAME "$HA_FEDERATEDX_SO";
+eval INSTALL PLUGIN oqgraph SONAME "$HA_OQGRAPH_SO";
+eval INSTALL PLUGIN sphinx SONAME "$HA_SPHINX_SO";
+eval INSTALL PLUGIN innodb SONAME "$HA_XTRADB_SO";
+eval INSTALL PLUGIN rpl_semi_sync_master SONAME "$SEMISYNC_MASTER_SO";
+eval INSTALL PLUGIN rpl_semi_sync_slave SONAME "$SEMISYNC_SLAVE_SO";
+--enable_abort_on_error
+--enable_result_log
+--enable_query_log
 
 #
 # This test verifies that *all* system variables are tested
@@ -48,6 +47,7 @@ perl;
   use File::Basename;
   my $dirname=dirname($ENV{MYSQLTEST_FILE});
   my @all_tests=<$dirname/*_basic{,_32,_64}.test>;
+  #*/
   open(F, '>', "$ENV{MYSQLTEST_VARDIR}/tmp/sys_vars.all_vars.txt") or die;
   binmode F;
   print F join "\n", sort map { s/_basic(_32|_64)?\.test$//; basename $_ } @all_tests;
@@ -78,11 +78,18 @@ select variable_name as `There should be *no* variables listed below:` from t2
 drop table t1;
 drop table t2;
 
-# Unloading the semisync plugins in case they were loaded
-if (`SELECT @@have_dynamic_loading = 'YES' AND LENGTH('$SEMISYNC_MASTER_PLUGIN') > 0`)
-{
-  --disable_query_log
-  UNINSTALL PLUGIN rpl_semi_sync_master;
-  UNINSTALL PLUGIN rpl_semi_sync_slave;
-  --enable_query_log
-}
+--disable_query_log
+--disable_result_log
+--disable_abort_on_error
+UNINSTALL PLUGIN archive;
+UNINSTALL PLUGIN blackhole;
+UNINSTALL PLUGIN federated;
+UNINSTALL PLUGIN oqgraph;
+UNINSTALL PLUGIN sphinx;
+UNINSTALL PLUGIN innodb;
+UNINSTALL PLUGIN rpl_semi_sync_master;
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+--enable_abort_on_error
+--enable_result_log
+--enable_query_log
+
diff --git a/mysql-test/suite/sys_vars/t/aria_block_size_basic.test b/mysql-test/suite/sys_vars/t/aria_block_size_basic.test
new file mode 100644
index 00000000000..ceac27fcd92
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_block_size_basic.test
@@ -0,0 +1,22 @@
+# ulong readonly
+
+--source include/have_maria.inc
+#
+# show the global and session values;
+#
+select @@global.aria_block_size;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.aria_block_size;
+show global variables like 'aria_block_size';
+show session variables like 'aria_block_size';
+select * from information_schema.global_variables where variable_name='aria_block_size';
+select * from information_schema.session_variables where variable_name='aria_block_size';
+
+#
+# show that it's read-only
+#
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set global aria_block_size=1;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set session aria_block_size=1;
+
diff --git a/mysql-test/suite/sys_vars/t/aria_checkpoint_interval_basic.test b/mysql-test/suite/sys_vars/t/aria_checkpoint_interval_basic.test
new file mode 100644
index 00000000000..6829ca99ba0
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_checkpoint_interval_basic.test
@@ -0,0 +1,43 @@
+# ulong global
+--source include/have_maria.inc
+
+SET @start_global_value = @@global.aria_checkpoint_interval;
+
+#
+# exists as global only
+#
+select @@global.aria_checkpoint_interval;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@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='aria_checkpoint_interval';
+select * from information_schema.session_variables where variable_name='aria_checkpoint_interval';
+
+#
+# show that it's writable
+#
+set global aria_checkpoint_interval=1;
+select @@global.aria_checkpoint_interval;
+--error ER_GLOBAL_VARIABLE
+set session aria_checkpoint_interval=1;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_checkpoint_interval=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_checkpoint_interval=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_checkpoint_interval="foo";
+
+#
+# min/max values
+#
+set global aria_checkpoint_interval=0;
+select @@global.aria_checkpoint_interval;
+set global aria_checkpoint_interval=cast(-1 as unsigned int);
+select @@global.aria_checkpoint_interval;
+
+SET @@global.aria_checkpoint_interval = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/aria_force_start_after_recovery_failures_basic.test b/mysql-test/suite/sys_vars/t/aria_force_start_after_recovery_failures_basic.test
new file mode 100644
index 00000000000..c99a303b795
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_force_start_after_recovery_failures_basic.test
@@ -0,0 +1,22 @@
+# ulong readonly
+
+--source include/have_maria.inc
+#
+# show the global and session values;
+#
+select @@global.aria_force_start_after_recovery_failures;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@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='aria_force_start_after_recovery_failures';
+select * from information_schema.session_variables where variable_name='aria_force_start_after_recovery_failures';
+
+#
+# show that it's read-only
+#
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set global aria_force_start_after_recovery_failures=1;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set session aria_force_start_after_recovery_failures=1;
+
diff --git a/mysql-test/suite/sys_vars/t/aria_group_commit_basic.test b/mysql-test/suite/sys_vars/t/aria_group_commit_basic.test
new file mode 100644
index 00000000000..11d7d598ef3
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_group_commit_basic.test
@@ -0,0 +1,47 @@
+# enum global
+--source include/have_maria.inc
+
+SET @start_global_value = @@global.aria_group_commit;
+
+#
+# exists as global only
+#
+select @@global.aria_group_commit;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@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='aria_group_commit';
+select * from information_schema.session_variables where variable_name='aria_group_commit';
+
+#
+# show that it's writable
+#
+set global aria_group_commit=1;
+select @@global.aria_group_commit;
+--error ER_GLOBAL_VARIABLE
+set session aria_group_commit=1;
+
+#
+# all valid values
+#
+set global aria_group_commit=none;
+select @@global.aria_group_commit;
+set global aria_group_commit=hard;
+select @@global.aria_group_commit;
+set global aria_group_commit=soft;
+select @@global.aria_group_commit;
+
+#
+# incorrect types/values
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_group_commit=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_group_commit=1e1;
+--error ER_WRONG_VALUE_FOR_VAR
+set global aria_group_commit="foo";
+--error ER_WRONG_VALUE_FOR_VAR
+set global aria_group_commit=3;
+
+SET @@global.aria_group_commit = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/aria_group_commit_interval_basic.test b/mysql-test/suite/sys_vars/t/aria_group_commit_interval_basic.test
new file mode 100644
index 00000000000..5b606ee1707
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_group_commit_interval_basic.test
@@ -0,0 +1,43 @@
+# ulong global
+--source include/have_maria.inc
+
+SET @start_global_value = @@global.aria_group_commit_interval;
+
+#
+# exists as global only
+#
+select @@global.aria_group_commit_interval;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@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='aria_group_commit_interval';
+select * from information_schema.session_variables where variable_name='aria_group_commit_interval';
+
+#
+# show that it's writable
+#
+set global aria_group_commit_interval=1;
+select @@global.aria_group_commit_interval;
+--error ER_GLOBAL_VARIABLE
+set session aria_group_commit_interval=1;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_group_commit_interval=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_group_commit_interval=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_group_commit_interval="foo";
+
+#
+# min/max values
+#
+set global aria_group_commit_interval=0;
+select @@global.aria_group_commit_interval;
+set global aria_group_commit_interval=cast(-1 as unsigned int);
+select @@global.aria_group_commit_interval;
+
+SET @@global.aria_group_commit_interval = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/aria_log_file_size_basic.test b/mysql-test/suite/sys_vars/t/aria_log_file_size_basic.test
new file mode 100644
index 00000000000..c403e7d3889
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_log_file_size_basic.test
@@ -0,0 +1,47 @@
+# ulong global
+--source include/have_maria.inc
+
+SET @start_global_value = @@global.aria_log_file_size;
+
+#
+# exists as global only
+#
+select @@global.aria_log_file_size;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@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='aria_log_file_size';
+select * from information_schema.session_variables where variable_name='aria_log_file_size';
+
+#
+# show that it's writable
+#
+set global aria_log_file_size=1024*1024*10;
+select @@global.aria_log_file_size;
+--error ER_GLOBAL_VARIABLE
+set session aria_log_file_size=1;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_log_file_size=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_log_file_size=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_log_file_size="foo";
+
+#
+# min/max values, block size
+#
+set global aria_log_file_size=1;
+select @@global.aria_log_file_size;
+set global aria_log_file_size=@@global.aria_log_file_size + 8192 - 1;
+select @@global.aria_log_file_size;
+set global aria_log_file_size=@@global.aria_log_file_size + 8192;
+select @@global.aria_log_file_size;
+set global aria_log_file_size=cast(-1 as unsigned int);
+select @@global.aria_log_file_size;
+
+SET @@global.aria_log_file_size = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/aria_log_purge_type_basic.test b/mysql-test/suite/sys_vars/t/aria_log_purge_type_basic.test
new file mode 100644
index 00000000000..6424b7db2c0
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_log_purge_type_basic.test
@@ -0,0 +1,47 @@
+# enum global
+--source include/have_maria.inc
+
+SET @start_global_value = @@global.aria_log_purge_type;
+
+#
+# exists as global only
+#
+select @@global.aria_log_purge_type;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@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='aria_log_purge_type';
+select * from information_schema.session_variables where variable_name='aria_log_purge_type';
+
+#
+# show that it's writable
+#
+set global aria_log_purge_type=1;
+select @@global.aria_log_purge_type;
+--error ER_GLOBAL_VARIABLE
+set session aria_log_purge_type=1;
+
+#
+# all valid values
+#
+set global aria_log_purge_type=immediate;
+select @@global.aria_log_purge_type;
+set global aria_log_purge_type=external;
+select @@global.aria_log_purge_type;
+set global aria_log_purge_type=at_flush;
+select @@global.aria_log_purge_type;
+
+#
+# incorrect types/values
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_log_purge_type=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_log_purge_type=1e1;
+--error ER_WRONG_VALUE_FOR_VAR
+set global aria_log_purge_type="foo";
+--error ER_WRONG_VALUE_FOR_VAR
+set global aria_log_purge_type=3;
+
+SET @@global.aria_log_purge_type = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/aria_max_sort_file_size_basic.test b/mysql-test/suite/sys_vars/t/aria_max_sort_file_size_basic.test
new file mode 100644
index 00000000000..b2385d2f99b
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_max_sort_file_size_basic.test
@@ -0,0 +1,47 @@
+# ulong global
+--source include/have_maria.inc
+
+SET @start_global_value = @@global.aria_max_sort_file_size;
+
+#
+# exists as global only
+#
+select @@global.aria_max_sort_file_size;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.aria_max_sort_file_size;
+show global variables like 'aria_max_sort_file_size';
+show session variables like 'aria_max_sort_file_size';
+select * from information_schema.global_variables where variable_name='aria_max_sort_file_size';
+select * from information_schema.session_variables where variable_name='aria_max_sort_file_size';
+
+#
+# show that it's writable
+#
+set global aria_max_sort_file_size=1024*1024*10;
+select @@global.aria_max_sort_file_size;
+--error ER_GLOBAL_VARIABLE
+set session aria_max_sort_file_size=1;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_max_sort_file_size=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_max_sort_file_size=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_max_sort_file_size="foo";
+
+#
+# min/max values, block size
+#
+set global aria_max_sort_file_size=1;
+select @@global.aria_max_sort_file_size;
+set global aria_max_sort_file_size=@@global.aria_max_sort_file_size + 1024*1024 - 1;
+select @@global.aria_max_sort_file_size;
+set global aria_max_sort_file_size=@@global.aria_max_sort_file_size + 1024*1024;
+select @@global.aria_max_sort_file_size;
+set global aria_max_sort_file_size=cast(-1 as unsigned int);
+select @@global.aria_max_sort_file_size;
+
+SET @@global.aria_max_sort_file_size = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/aria_page_checksum_basic.test b/mysql-test/suite/sys_vars/t/aria_page_checksum_basic.test
new file mode 100644
index 00000000000..5340699a346
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_page_checksum_basic.test
@@ -0,0 +1,39 @@
+# bool global
+--source include/have_maria.inc
+
+SET @start_global_value = @@global.aria_page_checksum;
+
+#
+# exists as global only
+#
+select @@global.aria_page_checksum;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@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='aria_page_checksum';
+select * from information_schema.session_variables where variable_name='aria_page_checksum';
+
+#
+# show that it's writable
+#
+set global aria_page_checksum=ON;
+select @@global.aria_page_checksum;
+set global aria_page_checksum=OFF;
+select @@global.aria_page_checksum;
+set global aria_page_checksum=1;
+select @@global.aria_page_checksum;
+--error ER_GLOBAL_VARIABLE
+set session aria_page_checksum=1;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_page_checksum=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_page_checksum=1e1;
+--error ER_WRONG_VALUE_FOR_VAR
+set global aria_page_checksum="foo";
+
+SET @@global.aria_page_checksum = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/aria_pagecache_age_threshold_basic.test b/mysql-test/suite/sys_vars/t/aria_pagecache_age_threshold_basic.test
new file mode 100644
index 00000000000..2d8dcc4eff5
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_pagecache_age_threshold_basic.test
@@ -0,0 +1,47 @@
+# ulong global
+--source include/have_maria.inc
+
+SET @start_global_value = @@global.aria_pagecache_age_threshold;
+
+#
+# exists as global only
+#
+select @@global.aria_pagecache_age_threshold;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@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='aria_pagecache_age_threshold';
+select * from information_schema.session_variables where variable_name='aria_pagecache_age_threshold';
+
+#
+# show that it's writable
+#
+set global aria_pagecache_age_threshold=200;
+select @@global.aria_pagecache_age_threshold;
+--error ER_GLOBAL_VARIABLE
+set session aria_pagecache_age_threshold=1;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_pagecache_age_threshold=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_pagecache_age_threshold=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_pagecache_age_threshold="foo";
+
+#
+# min/max values, block size
+#
+set global aria_pagecache_age_threshold=1;
+select @@global.aria_pagecache_age_threshold;
+set global aria_pagecache_age_threshold=@@global.aria_pagecache_age_threshold + 100 - 1;
+select @@global.aria_pagecache_age_threshold;
+set global aria_pagecache_age_threshold=@@global.aria_pagecache_age_threshold + 100;
+select @@global.aria_pagecache_age_threshold;
+set global aria_pagecache_age_threshold=cast(-1 as unsigned int);
+select @@global.aria_pagecache_age_threshold;
+
+SET @@global.aria_pagecache_age_threshold = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/aria_pagecache_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/aria_pagecache_buffer_size_basic.test
new file mode 100644
index 00000000000..172787d793a
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_pagecache_buffer_size_basic.test
@@ -0,0 +1,22 @@
+# ulong readonly
+
+--source include/have_maria.inc
+#
+# show the global and session values;
+#
+select @@global.aria_pagecache_buffer_size;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@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='aria_pagecache_buffer_size';
+select * from information_schema.session_variables where variable_name='aria_pagecache_buffer_size';
+
+#
+# show that it's read-only
+#
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set global aria_pagecache_buffer_size=1;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set session aria_pagecache_buffer_size=1;
+
diff --git a/mysql-test/suite/sys_vars/t/aria_pagecache_division_limit_basic.test b/mysql-test/suite/sys_vars/t/aria_pagecache_division_limit_basic.test
new file mode 100644
index 00000000000..096b9869979
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_pagecache_division_limit_basic.test
@@ -0,0 +1,43 @@
+# ulong global
+--source include/have_maria.inc
+
+SET @start_global_value = @@global.aria_pagecache_division_limit;
+
+#
+# exists as global only
+#
+select @@global.aria_pagecache_division_limit;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@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='aria_pagecache_division_limit';
+select * from information_schema.session_variables where variable_name='aria_pagecache_division_limit';
+
+#
+# show that it's writable
+#
+set global aria_pagecache_division_limit=20;
+select @@global.aria_pagecache_division_limit;
+--error ER_GLOBAL_VARIABLE
+set session aria_pagecache_division_limit=1;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_pagecache_division_limit=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_pagecache_division_limit=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_pagecache_division_limit="foo";
+
+#
+# min/max values, block size
+#
+set global aria_pagecache_division_limit=0;
+select @@global.aria_pagecache_division_limit;
+set global aria_pagecache_division_limit=cast(-1 as unsigned int);
+select @@global.aria_pagecache_division_limit;
+
+SET @@global.aria_pagecache_division_limit = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/aria_recover_basic.test b/mysql-test/suite/sys_vars/t/aria_recover_basic.test
new file mode 100644
index 00000000000..25aa2d7cf77
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_recover_basic.test
@@ -0,0 +1,51 @@
+# enum global
+--source include/have_maria.inc
+
+SET @start_global_value = @@global.aria_recover;
+
+#
+# exists as global only
+#
+select @@global.aria_recover;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.aria_recover;
+show global variables like 'aria_recover';
+show session variables like 'aria_recover';
+select * from information_schema.global_variables where variable_name='aria_recover';
+select * from information_schema.session_variables where variable_name='aria_recover';
+
+#
+# show that it's writable
+#
+set global aria_recover=1;
+select @@global.aria_recover;
+--error ER_GLOBAL_VARIABLE
+set session aria_recover=1;
+
+#
+# all valid values
+#
+set global aria_recover=normal;
+select @@global.aria_recover;
+set global aria_recover=backup;
+select @@global.aria_recover;
+set global aria_recover='force';
+select @@global.aria_recover;
+set global aria_recover='quick';
+select @@global.aria_recover;
+set global aria_recover=off;
+select @@global.aria_recover;
+
+#
+# incorrect types/values
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_recover=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_recover=1e1;
+--error ER_WRONG_VALUE_FOR_VAR
+set global aria_recover="foo";
+--error ER_WRONG_VALUE_FOR_VAR
+set global aria_recover=5;
+
+SET @@global.aria_recover = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/aria_repair_threads_basic.test b/mysql-test/suite/sys_vars/t/aria_repair_threads_basic.test
new file mode 100644
index 00000000000..476bd0b4cb2
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_repair_threads_basic.test
@@ -0,0 +1,43 @@
+# ulong session
+--source include/have_maria.inc
+
+SET @start_global_value = @@global.aria_repair_threads;
+
+#
+# exists as global only
+#
+select @@global.aria_repair_threads;
+select @@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='aria_repair_threads';
+select * from information_schema.session_variables where variable_name='aria_repair_threads';
+
+#
+# show that it's writable
+#
+set global aria_repair_threads=10;
+select @@global.aria_repair_threads;
+set session aria_repair_threads=10;
+select @@session.aria_repair_threads;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_repair_threads=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set session aria_repair_threads=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_repair_threads="foo";
+
+#
+# min/max values, block size
+#
+set global aria_repair_threads=0;
+select @@global.aria_repair_threads;
+set session aria_repair_threads=cast(-1 as unsigned int);
+select @@session.aria_repair_threads;
+
+SET @@global.aria_repair_threads = @start_global_value;
+
diff --git a/mysql-test/suite/sys_vars/t/aria_sort_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/aria_sort_buffer_size_basic.test
new file mode 100644
index 00000000000..699f6ae8e20
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_sort_buffer_size_basic.test
@@ -0,0 +1,43 @@
+# ulong session
+--source include/have_maria.inc
+
+SET @start_global_value = @@global.aria_sort_buffer_size;
+
+#
+# exists as global only
+#
+select @@global.aria_sort_buffer_size;
+select @@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='aria_sort_buffer_size';
+select * from information_schema.session_variables where variable_name='aria_sort_buffer_size';
+
+#
+# show that it's writable
+#
+set global aria_sort_buffer_size=10;
+select @@global.aria_sort_buffer_size;
+set session aria_sort_buffer_size=10;
+select @@session.aria_sort_buffer_size;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_sort_buffer_size=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set session aria_sort_buffer_size=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_sort_buffer_size="foo";
+
+#
+# min/max values, block size
+#
+set global aria_sort_buffer_size=0;
+select @@global.aria_sort_buffer_size;
+set session aria_sort_buffer_size=cast(-1 as unsigned int);
+select @@session.aria_sort_buffer_size;
+
+SET @@global.aria_sort_buffer_size = @start_global_value;
+
diff --git a/mysql-test/suite/sys_vars/t/aria_stats_method_basic.test b/mysql-test/suite/sys_vars/t/aria_stats_method_basic.test
new file mode 100644
index 00000000000..6db279237c1
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_stats_method_basic.test
@@ -0,0 +1,46 @@
+# enum session
+--source include/have_maria.inc
+
+SET @start_global_value = @@global.aria_stats_method;
+
+#
+# exists as global only
+#
+select @@global.aria_stats_method;
+select @@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='aria_stats_method';
+select * from information_schema.session_variables where variable_name='aria_stats_method';
+
+#
+# show that it's writable
+#
+set global aria_stats_method=1;
+select @@global.aria_stats_method;
+set session aria_stats_method=1;
+select @@session.aria_stats_method;
+
+#
+# all valid values
+#
+set session aria_stats_method=nulls_unequal;
+select @@session.aria_stats_method;
+set session aria_stats_method=nulls_equal;
+select @@session.aria_stats_method;
+set session aria_stats_method=nulls_ignored;
+select @@session.aria_stats_method;
+
+#
+# incorrect types/values
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set session aria_stats_method=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set session aria_stats_method=1e1;
+--error ER_WRONG_VALUE_FOR_VAR
+set session aria_stats_method="foo";
+--error ER_WRONG_VALUE_FOR_VAR
+set session aria_stats_method=3;
+
+SET @@global.aria_stats_method = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/aria_sync_log_dir_basic.test b/mysql-test/suite/sys_vars/t/aria_sync_log_dir_basic.test
new file mode 100644
index 00000000000..7809e0d8d11
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_sync_log_dir_basic.test
@@ -0,0 +1,47 @@
+# enum global
+--source include/have_maria.inc
+
+SET @start_global_value = @@global.aria_sync_log_dir;
+
+#
+# exists as global only
+#
+select @@global.aria_sync_log_dir;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@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='aria_sync_log_dir';
+select * from information_schema.session_variables where variable_name='aria_sync_log_dir';
+
+#
+# show that it's writable
+#
+set global aria_sync_log_dir=1;
+select @@global.aria_sync_log_dir;
+--error ER_GLOBAL_VARIABLE
+set session aria_sync_log_dir=1;
+
+#
+# all valid values
+#
+set global aria_sync_log_dir=never;
+select @@global.aria_sync_log_dir;
+set global aria_sync_log_dir=newfile;
+select @@global.aria_sync_log_dir;
+set global aria_sync_log_dir=always;
+select @@global.aria_sync_log_dir;
+
+#
+# incorrect types/values
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_sync_log_dir=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global aria_sync_log_dir=1e1;
+--error ER_WRONG_VALUE_FOR_VAR
+set global aria_sync_log_dir="foo";
+--error ER_WRONG_VALUE_FOR_VAR
+set global aria_sync_log_dir=3;
+
+SET @@global.aria_sync_log_dir = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/aria_used_for_temp_tables_basic.test b/mysql-test/suite/sys_vars/t/aria_used_for_temp_tables_basic.test
new file mode 100644
index 00000000000..e962dcf178d
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/aria_used_for_temp_tables_basic.test
@@ -0,0 +1,22 @@
+# bool readonly
+
+--source include/have_maria.inc
+#
+# show the global and session values;
+#
+select @@global.aria_used_for_temp_tables;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.aria_used_for_temp_tables;
+show global variables like 'aria_used_for_temp_tables';
+show session variables like 'aria_used_for_temp_tables';
+select * from information_schema.global_variables where variable_name='aria_used_for_temp_tables';
+select * from information_schema.session_variables where variable_name='aria_used_for_temp_tables';
+
+#
+# show that it's read-only
+#
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set global aria_used_for_temp_tables=1;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set session aria_used_for_temp_tables=1;
+
diff --git a/mysql-test/suite/sys_vars/t/deadlock_search_depth_long_basic.test b/mysql-test/suite/sys_vars/t/deadlock_search_depth_long_basic.test
new file mode 100644
index 00000000000..1862015b0a3
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/deadlock_search_depth_long_basic.test
@@ -0,0 +1,42 @@
+# ulong session
+
+SET @start_global_value = @@global.deadlock_search_depth_long;
+
+#
+# exists as global only
+#
+select @@global.deadlock_search_depth_long;
+select @@session.deadlock_search_depth_long;
+show global variables like 'deadlock_search_depth_long';
+show session variables like 'deadlock_search_depth_long';
+select * from information_schema.global_variables where variable_name='deadlock_search_depth_long';
+select * from information_schema.session_variables where variable_name='deadlock_search_depth_long';
+
+#
+# show that it's writable
+#
+set global deadlock_search_depth_long=10;
+select @@global.deadlock_search_depth_long;
+set session deadlock_search_depth_long=10;
+select @@session.deadlock_search_depth_long;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global deadlock_search_depth_long=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set session deadlock_search_depth_long=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global deadlock_search_depth_long="foo";
+
+#
+# min/max values, block size
+#
+set global deadlock_search_depth_long=0;
+select @@global.deadlock_search_depth_long;
+set session deadlock_search_depth_long=cast(-1 as unsigned int);
+select @@session.deadlock_search_depth_long;
+
+SET @@global.deadlock_search_depth_long = @start_global_value;
+
diff --git a/mysql-test/suite/sys_vars/t/deadlock_search_depth_short_basic.test b/mysql-test/suite/sys_vars/t/deadlock_search_depth_short_basic.test
new file mode 100644
index 00000000000..3df6fb92c51
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/deadlock_search_depth_short_basic.test
@@ -0,0 +1,42 @@
+# ulong session
+
+SET @start_global_value = @@global.deadlock_search_depth_short;
+
+#
+# exists as global only
+#
+select @@global.deadlock_search_depth_short;
+select @@session.deadlock_search_depth_short;
+show global variables like 'deadlock_search_depth_short';
+show session variables like 'deadlock_search_depth_short';
+select * from information_schema.global_variables where variable_name='deadlock_search_depth_short';
+select * from information_schema.session_variables where variable_name='deadlock_search_depth_short';
+
+#
+# show that it's writable
+#
+set global deadlock_search_depth_short=10;
+select @@global.deadlock_search_depth_short;
+set session deadlock_search_depth_short=10;
+select @@session.deadlock_search_depth_short;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global deadlock_search_depth_short=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set session deadlock_search_depth_short=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global deadlock_search_depth_short="foo";
+
+#
+# min/max values, block size
+#
+set global deadlock_search_depth_short=0;
+select @@global.deadlock_search_depth_short;
+set session deadlock_search_depth_short=cast(-1 as unsigned int);
+select @@session.deadlock_search_depth_short;
+
+SET @@global.deadlock_search_depth_short = @start_global_value;
+
diff --git a/mysql-test/suite/sys_vars/t/deadlock_timeout_long_basic.test b/mysql-test/suite/sys_vars/t/deadlock_timeout_long_basic.test
new file mode 100644
index 00000000000..4ebc3cc059d
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/deadlock_timeout_long_basic.test
@@ -0,0 +1,42 @@
+# ulong session
+
+SET @start_global_value = @@global.deadlock_timeout_long;
+
+#
+# exists as global only
+#
+select @@global.deadlock_timeout_long;
+select @@session.deadlock_timeout_long;
+show global variables like 'deadlock_timeout_long';
+show session variables like 'deadlock_timeout_long';
+select * from information_schema.global_variables where variable_name='deadlock_timeout_long';
+select * from information_schema.session_variables where variable_name='deadlock_timeout_long';
+
+#
+# show that it's writable
+#
+set global deadlock_timeout_long=10;
+select @@global.deadlock_timeout_long;
+set session deadlock_timeout_long=10;
+select @@session.deadlock_timeout_long;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global deadlock_timeout_long=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set session deadlock_timeout_long=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global deadlock_timeout_long="foo";
+
+#
+# min/max values, block size
+#
+set global deadlock_timeout_long=0;
+select @@global.deadlock_timeout_long;
+set session deadlock_timeout_long=cast(-1 as unsigned int);
+select @@session.deadlock_timeout_long;
+
+SET @@global.deadlock_timeout_long = @start_global_value;
+
diff --git a/mysql-test/suite/sys_vars/t/deadlock_timeout_short_basic.test b/mysql-test/suite/sys_vars/t/deadlock_timeout_short_basic.test
new file mode 100644
index 00000000000..86beeaeae9c
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/deadlock_timeout_short_basic.test
@@ -0,0 +1,42 @@
+# ulong session
+
+SET @start_global_value = @@global.deadlock_timeout_short;
+
+#
+# exists as global only
+#
+select @@global.deadlock_timeout_short;
+select @@session.deadlock_timeout_short;
+show global variables like 'deadlock_timeout_short';
+show session variables like 'deadlock_timeout_short';
+select * from information_schema.global_variables where variable_name='deadlock_timeout_short';
+select * from information_schema.session_variables where variable_name='deadlock_timeout_short';
+
+#
+# show that it's writable
+#
+set global deadlock_timeout_short=10;
+select @@global.deadlock_timeout_short;
+set session deadlock_timeout_short=10;
+select @@session.deadlock_timeout_short;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global deadlock_timeout_short=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set session deadlock_timeout_short=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global deadlock_timeout_short="foo";
+
+#
+# min/max values, block size
+#
+set global deadlock_timeout_short=0;
+select @@global.deadlock_timeout_short;
+set session deadlock_timeout_short=cast(-1 as unsigned int);
+select @@session.deadlock_timeout_short;
+
+SET @@global.deadlock_timeout_short = @start_global_value;
+
diff --git a/mysql-test/suite/sys_vars/t/debug_crc_break_basic.test b/mysql-test/suite/sys_vars/t/debug_crc_break_basic.test
new file mode 100644
index 00000000000..f7d17a8e5ad
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/debug_crc_break_basic.test
@@ -0,0 +1,42 @@
+# ulong global
+
+SET @start_global_value = @@global.debug_crc_break;
+
+#
+# exists as global only
+#
+select @@global.debug_crc_break;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.debug_crc_break;
+show global variables like 'debug_crc_break';
+show session variables like 'debug_crc_break';
+select * from information_schema.global_variables where variable_name='debug_crc_break';
+select * from information_schema.session_variables where variable_name='debug_crc_break';
+
+#
+# show that it's writable
+#
+set global debug_crc_break=1;
+select @@global.debug_crc_break;
+--error ER_GLOBAL_VARIABLE
+set session debug_crc_break=1;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global debug_crc_break=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global debug_crc_break=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global debug_crc_break="foo";
+
+#
+# min/max values
+#
+set global debug_crc_break=0;
+select @@global.debug_crc_break;
+set global debug_crc_break=cast(-1 as unsigned int);
+select @@global.debug_crc_break;
+
+SET @@global.debug_crc_break = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/default_storage_engine_basic.test b/mysql-test/suite/sys_vars/t/default_storage_engine_basic.test
index f47453eb234..3e805688565 100644
--- a/mysql-test/suite/sys_vars/t/default_storage_engine_basic.test
+++ b/mysql-test/suite/sys_vars/t/default_storage_engine_basic.test
@@ -29,9 +29,7 @@
 #############################################################
 
 SET @start_global_value = @@global.default_storage_engine;
-SELECT @start_global_value;
 SET @start_session_value = @@session.default_storage_engine;
-SELECT @start_session_value;
 
 
 --echo '#--------------------FN_DYNVARS_005_01-------------------------#'
@@ -41,10 +39,12 @@ SELECT @start_session_value;
 
 SET @@global.default_storage_engine = INNODB;
 SET @@global.default_storage_engine = DEFAULT;
+--replace_result MyISAM InnoDB
 SELECT @@global.default_storage_engine;
 
 SET @@session.default_storage_engine = INNODB;
 SET @@session.default_storage_engine = DEFAULT;
+--replace_result MyISAM InnoDB
 SELECT @@session.default_storage_engine;
 
 
@@ -173,10 +173,7 @@ SET @@default_storage_engine = @start_global_value;
 ####################################
 
 SET @@global.default_storage_engine = @start_global_value;
-SELECT @@global.default_storage_engine;
 SET @@session.default_storage_engine = @start_session_value;
-SELECT @@session.default_storage_engine;
-
 
 #############################################################
 #                 END OF default_storage_engine TESTS               #
diff --git a/mysql-test/suite/sys_vars/t/disabled.def b/mysql-test/suite/sys_vars/t/disabled.def
index 483eea9daeb..ba9f819f96b 100644
--- a/mysql-test/suite/sys_vars/t/disabled.def
+++ b/mysql-test/suite/sys_vars/t/disabled.def
@@ -14,4 +14,5 @@ query_cache_size_basic_64           : Bug#36747: Allocating a large query cache
 transaction_prealloc_size_basic_32  : Bug#36747
 transaction_prealloc_size_basic_64  : Bug#36747
 #thread_cache_size_func             : Bug#40575: 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads
-
+multi_range_count_basic_32          : no such variable
+multi_range_count_basic_64          : no such variable
diff --git a/mysql-test/suite/sys_vars/t/extra_max_connections_basic.test b/mysql-test/suite/sys_vars/t/extra_max_connections_basic.test
new file mode 100644
index 00000000000..214e64ebe7d
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/extra_max_connections_basic.test
@@ -0,0 +1,42 @@
+# ulong global
+
+SET @start_global_value = @@global.extra_max_connections;
+
+#
+# exists as global only
+#
+select @@global.extra_max_connections;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.extra_max_connections;
+show global variables like 'extra_max_connections';
+show session variables like 'extra_max_connections';
+select * from information_schema.global_variables where variable_name='extra_max_connections';
+select * from information_schema.session_variables where variable_name='extra_max_connections';
+
+#
+# show that it's writable
+#
+set global extra_max_connections=1;
+select @@global.extra_max_connections;
+--error ER_GLOBAL_VARIABLE
+set session extra_max_connections=1;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global extra_max_connections=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global extra_max_connections=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global extra_max_connections="foo";
+
+#
+# min/max values
+#
+set global extra_max_connections=0;
+select @@global.extra_max_connections;
+set global extra_max_connections=cast(-1 as unsigned int);
+select @@global.extra_max_connections;
+
+SET @@global.extra_max_connections = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/extra_port_basic.test b/mysql-test/suite/sys_vars/t/extra_port_basic.test
new file mode 100644
index 00000000000..af5500e7ab7
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/extra_port_basic.test
@@ -0,0 +1,21 @@
+# ulong readonly
+
+#
+# show the global and session values;
+#
+select @@global.extra_port;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.extra_port;
+show global variables like 'extra_port';
+show session variables like 'extra_port';
+select * from information_schema.global_variables where variable_name='extra_port';
+select * from information_schema.session_variables where variable_name='extra_port';
+
+#
+# show that it's read-only
+#
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set global extra_port=1;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set session extra_port=1;
+
diff --git a/mysql-test/suite/sys_vars/t/join_cache_level_basic.test b/mysql-test/suite/sys_vars/t/join_cache_level_basic.test
new file mode 100644
index 00000000000..1e0deb9c028
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/join_cache_level_basic.test
@@ -0,0 +1,42 @@
+# ulong session
+
+SET @start_global_value = @@global.join_cache_level;
+
+#
+# exists as global only
+#
+select @@global.join_cache_level;
+select @@session.join_cache_level;
+show global variables like 'join_cache_level';
+show session variables like 'join_cache_level';
+select * from information_schema.global_variables where variable_name='join_cache_level';
+select * from information_schema.session_variables where variable_name='join_cache_level';
+
+#
+# show that it's writable
+#
+set global join_cache_level=4;
+select @@global.join_cache_level;
+set session join_cache_level=4;
+select @@session.join_cache_level;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global join_cache_level=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set session join_cache_level=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global join_cache_level="foo";
+
+#
+# min/max values, block size
+#
+set global join_cache_level=0;
+select @@global.join_cache_level;
+set session join_cache_level=cast(-1 as unsigned int);
+select @@session.join_cache_level;
+
+SET @@global.join_cache_level = @start_global_value;
+
diff --git a/mysql-test/suite/sys_vars/t/key_cache_segments_basic.test b/mysql-test/suite/sys_vars/t/key_cache_segments_basic.test
new file mode 100644
index 00000000000..ce0c736e4cc
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/key_cache_segments_basic.test
@@ -0,0 +1,42 @@
+# ulong global
+
+SET @start_global_value = @@global.key_cache_segments;
+
+#
+# exists as global only
+#
+select @@global.key_cache_segments;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.key_cache_segments;
+show global variables like 'key_cache_segments';
+show session variables like 'key_cache_segments';
+select * from information_schema.global_variables where variable_name='key_cache_segments';
+select * from information_schema.session_variables where variable_name='key_cache_segments';
+
+#
+# show that it's writable
+#
+set global key_cache_segments=1;
+select @@global.key_cache_segments;
+--error ER_GLOBAL_VARIABLE
+set session key_cache_segments=1;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global key_cache_segments=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global key_cache_segments=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global key_cache_segments="foo";
+
+#
+# min/max values
+#
+set global key_cache_segments=0;
+select @@global.key_cache_segments;
+set global key_cache_segments=cast(-1 as unsigned int);
+select @@global.key_cache_segments;
+
+SET @@global.key_cache_segments = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/log_slow_filter_basic.test b/mysql-test/suite/sys_vars/t/log_slow_filter_basic.test
new file mode 100644
index 00000000000..2891b7ded8b
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/log_slow_filter_basic.test
@@ -0,0 +1,69 @@
+# set session
+
+SET @start_global_value = @@global.log_slow_filter;
+
+#
+# exists as global only
+#
+select @@global.log_slow_filter;
+select @@session.log_slow_filter;
+show global variables like 'log_slow_filter';
+show session variables like 'log_slow_filter';
+select * from information_schema.global_variables where variable_name='log_slow_filter';
+select * from information_schema.session_variables where variable_name='log_slow_filter';
+
+#
+# show that it's writable
+#
+set global log_slow_filter=1;
+select @@global.log_slow_filter;
+set session log_slow_filter=1;
+select @@session.log_slow_filter;
+
+#
+# all valid values
+#
+set session log_slow_filter=1;
+select @@session.log_slow_filter;
+set session log_slow_filter=2;
+select @@session.log_slow_filter;
+set session log_slow_filter=5;
+select @@session.log_slow_filter;
+set session log_slow_filter='admin';
+select @@session.log_slow_filter;
+set session log_slow_filter='filesort';
+select @@session.log_slow_filter;
+set session log_slow_filter='filesort_on_disk';
+select @@session.log_slow_filter;
+set session log_slow_filter='full_join';
+select @@session.log_slow_filter;
+set session log_slow_filter='full_scan';
+select @@session.log_slow_filter;
+set session log_slow_filter='query_cache';
+select @@session.log_slow_filter;
+set session log_slow_filter='query_cache_miss';
+select @@session.log_slow_filter;
+set session log_slow_filter='tmp_table';
+select @@session.log_slow_filter;
+set session log_slow_filter='tmp_table_on_disk';
+select @@session.log_slow_filter;
+set session log_slow_filter='filesort,query_cache';
+select @@session.log_slow_filter;
+set session log_slow_filter='admin,filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk';
+select @@session.log_slow_filter;
+set session log_slow_filter='';
+select @@session.log_slow_filter;
+
+#
+# incorrect types/values
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set session log_slow_filter=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set session log_slow_filter=1e1;
+--error ER_WRONG_VALUE_FOR_VAR
+set session log_slow_filter="foo";
+--error ER_WRONG_VALUE_FOR_VAR
+set session log_slow_filter=1024;
+
+SET @@global.log_slow_filter = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/t/log_slow_rate_limit_basic.test b/mysql-test/suite/sys_vars/t/log_slow_rate_limit_basic.test
new file mode 100644
index 00000000000..bb90b29e5f4
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/log_slow_rate_limit_basic.test
@@ -0,0 +1,42 @@
+# ulong session
+
+SET @start_global_value = @@global.log_slow_rate_limit;
+
+#
+# exists as global only
+#
+select @@global.log_slow_rate_limit;
+select @@session.log_slow_rate_limit;
+show global variables like 'log_slow_rate_limit';
+show session variables like 'log_slow_rate_limit';
+select * from information_schema.global_variables where variable_name='log_slow_rate_limit';
+select * from information_schema.session_variables where variable_name='log_slow_rate_limit';
+
+#
+# show that it's writable
+#
+set global log_slow_rate_limit=10;
+select @@global.log_slow_rate_limit;
+set session log_slow_rate_limit=10;
+select @@session.log_slow_rate_limit;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global log_slow_rate_limit=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set session log_slow_rate_limit=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global log_slow_rate_limit="foo";
+
+#
+# min/max values, block size
+#
+set global log_slow_rate_limit=0;
+select @@global.log_slow_rate_limit;
+set session log_slow_rate_limit=cast(-1 as unsigned int);
+select @@session.log_slow_rate_limit;
+
+SET @@global.log_slow_rate_limit = @start_global_value;
+
diff --git a/mysql-test/suite/sys_vars/t/log_slow_verbosity_basic.test b/mysql-test/suite/sys_vars/t/log_slow_verbosity_basic.test
new file mode 100644
index 00000000000..9302d5f1210
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/log_slow_verbosity_basic.test
@@ -0,0 +1,53 @@
+# set session
+
+SET @start_global_value = @@global.log_slow_verbosity;
+
+#
+# exists as global only
+#
+select @@global.log_slow_verbosity;
+select @@session.log_slow_verbosity;
+show global variables like 'log_slow_verbosity';
+show session variables like 'log_slow_verbosity';
+select * from information_schema.global_variables where variable_name='log_slow_verbosity';
+select * from information_schema.session_variables where variable_name='log_slow_verbosity';
+
+#
+# show that it's writable
+#
+set global log_slow_verbosity=1;
+select @@global.log_slow_verbosity;
+set session log_slow_verbosity=1;
+select @@session.log_slow_verbosity;
+
+#
+# all valid values
+#
+set session log_slow_verbosity=1;
+select @@session.log_slow_verbosity;
+set session log_slow_verbosity=2;
+select @@session.log_slow_verbosity;
+set session log_slow_verbosity=3;
+select @@session.log_slow_verbosity;
+set session log_slow_verbosity='innodb';
+select @@session.log_slow_verbosity;
+set session log_slow_verbosity='query_plan';
+select @@session.log_slow_verbosity;
+set session log_slow_verbosity='innodb,query_plan';
+select @@session.log_slow_verbosity;
+set session log_slow_verbosity='';
+select @@session.log_slow_verbosity;
+
+#
+# incorrect types/values
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set session log_slow_verbosity=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set session log_slow_verbosity=1e1;
+--error ER_WRONG_VALUE_FOR_VAR
+set session log_slow_verbosity="foo";
+--error ER_WRONG_VALUE_FOR_VAR
+set session log_slow_verbosity=4;
+
+SET @@global.log_slow_verbosity = @start_global_value;
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
new file mode 100644
index 00000000000..5acfcab539a
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_block_size_basic.test
@@ -0,0 +1,24 @@
+# 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
new file mode 100644
index 00000000000..ccbf9ee8eb0
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_checkpoint_interval_basic.test
@@ -0,0 +1,43 @@
+# 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
new file mode 100644
index 00000000000..a6b69561a7e
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_force_start_after_recovery_failures_basic.test
@@ -0,0 +1,22 @@
+# 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
new file mode 100644
index 00000000000..09a9cb6f46e
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_group_commit_basic.test
@@ -0,0 +1,47 @@
+# 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
new file mode 100644
index 00000000000..d60219fad5e
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_group_commit_interval_basic.test
@@ -0,0 +1,43 @@
+# 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
new file mode 100644
index 00000000000..367ee6c3365
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_log_file_size_basic.test
@@ -0,0 +1,47 @@
+# 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
new file mode 100644
index 00000000000..1bf6221922c
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_log_purge_type_basic.test
@@ -0,0 +1,47 @@
+# 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
new file mode 100644
index 00000000000..1879449935b
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_max_sort_file_size_basic.test
@@ -0,0 +1,49 @@
+# 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
new file mode 100644
index 00000000000..2085abdffd5
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_page_checksum_basic.test
@@ -0,0 +1,39 @@
+# 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
new file mode 100644
index 00000000000..17204db2c6c
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_pagecache_age_threshold_basic.test
@@ -0,0 +1,47 @@
+# 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
new file mode 100644
index 00000000000..1c37d2014db
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_pagecache_buffer_size_basic.test
@@ -0,0 +1,22 @@
+# 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
new file mode 100644
index 00000000000..c68cb05de10
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_pagecache_division_limit_basic.test
@@ -0,0 +1,43 @@
+# 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
new file mode 100644
index 00000000000..d188339929d
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_recover_basic.test
@@ -0,0 +1,51 @@
+# 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
new file mode 100644
index 00000000000..7f66d18f528
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_repair_threads_basic.test
@@ -0,0 +1,43 @@
+# 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
new file mode 100644
index 00000000000..7887e2d19b5
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_sort_buffer_size_basic.test
@@ -0,0 +1,43 @@
+# 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
new file mode 100644
index 00000000000..d615705c65a
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_stats_method_basic.test
@@ -0,0 +1,46 @@
+# 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
new file mode 100644
index 00000000000..7e9a424cc49
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_sync_log_dir_basic.test
@@ -0,0 +1,47 @@
+# 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
new file mode 100644
index 00000000000..504e2dfbcb5
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_used_for_temp_tables_basic.test
@@ -0,0 +1,22 @@
+# 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';
+select * from information_schema.global_variables where variable_name like '%aria_used_for_temp_tables';
+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/mrr_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/mrr_buffer_size_basic.test
new file mode 100644
index 00000000000..5641bb7db6f
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/mrr_buffer_size_basic.test
@@ -0,0 +1,42 @@
+# ulong session
+
+SET @start_global_value = @@global.mrr_buffer_size;
+
+#
+# exists as global only
+#
+select @@global.mrr_buffer_size;
+select @@session.mrr_buffer_size;
+show global variables like 'mrr_buffer_size';
+show session variables like 'mrr_buffer_size';
+select * from information_schema.global_variables where variable_name='mrr_buffer_size';
+select * from information_schema.session_variables where variable_name='mrr_buffer_size';
+
+#
+# show that it's writable
+#
+set global mrr_buffer_size=10;
+select @@global.mrr_buffer_size;
+set session mrr_buffer_size=10;
+select @@session.mrr_buffer_size;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global mrr_buffer_size=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set session mrr_buffer_size=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global mrr_buffer_size="foo";
+
+#
+# min/max values, block size
+#
+set global mrr_buffer_size=0;
+select @@global.mrr_buffer_size;
+set session mrr_buffer_size=cast(-1 as unsigned int);
+select @@session.mrr_buffer_size;
+
+SET @@global.mrr_buffer_size = @start_global_value;
+
diff --git a/mysql-test/suite/sys_vars/t/mutex_deadlock_detector_basic.test b/mysql-test/suite/sys_vars/t/mutex_deadlock_detector_basic.test
new file mode 100644
index 00000000000..03b7743a7aa
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/mutex_deadlock_detector_basic.test
@@ -0,0 +1,21 @@
+# bool readonly
+
+#
+# show the global and session values;
+#
+select @@global.mutex_deadlock_detector;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.mutex_deadlock_detector;
+show global variables like 'mutex_deadlock_detector';
+show session variables like 'mutex_deadlock_detector';
+select * from information_schema.global_variables where variable_name='mutex_deadlock_detector';
+select * from information_schema.session_variables where variable_name='mutex_deadlock_detector';
+
+#
+# show that it's read-only
+#
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set global mutex_deadlock_detector=1;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set session mutex_deadlock_detector=1;
+
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
new file mode 100644
index 00000000000..bb5f1284614
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/optimizer_use_mrr_basic.test
@@ -0,0 +1,46 @@
+# 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/plugin_dir_basic.test b/mysql-test/suite/sys_vars/t/plugin_dir_basic.test
index d714950c807..24dc15b646e 100644
--- a/mysql-test/suite/sys_vars/t/plugin_dir_basic.test
+++ b/mysql-test/suite/sys_vars/t/plugin_dir_basic.test
@@ -5,18 +5,20 @@
 #
 # on windows it's <basedir>/lib/plugin
 # on unix it's <basedir>/lib/mysql/plugin
+# unless mtr sets it to $MYSQL_TEST_DIR/var/plugins
 #
---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
+let plugindir=$MYSQL_TEST_DIR/var;
+--replace_result $plugindir MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
 select @@global.plugin_dir;
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
 select @@session.plugin_dir;
---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
+--replace_result $plugindir MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
 show global variables like 'plugin_dir';
---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
+--replace_result $plugindir MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
 show session variables like 'plugin_dir';
---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
+--replace_result $plugindir MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
 select * from information_schema.global_variables where variable_name='plugin_dir';
---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
+--replace_result $plugindir MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
 select * from information_schema.session_variables where variable_name='plugin_dir';
 
 #
diff --git a/mysql-test/suite/sys_vars/t/plugin_maturity_basic.test b/mysql-test/suite/sys_vars/t/plugin_maturity_basic.test
new file mode 100644
index 00000000000..2590e07c85f
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/plugin_maturity_basic.test
@@ -0,0 +1,21 @@
+# enum readonly
+
+#
+# show the global and session values;
+#
+select @@global.plugin_maturity;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.plugin_maturity;
+show global variables like 'plugin_maturity';
+show session variables like 'plugin_maturity';
+select * from information_schema.global_variables where variable_name='plugin_maturity';
+select * from information_schema.session_variables where variable_name='plugin_maturity';
+
+#
+# show that it's read-only
+#
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set global plugin_maturity=1;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set session plugin_maturity=1;
+
diff --git a/mysql-test/suite/sys_vars/t/rowid_merge_buff_size_basic.test b/mysql-test/suite/sys_vars/t/rowid_merge_buff_size_basic.test
new file mode 100644
index 00000000000..1c88bdd7180
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/rowid_merge_buff_size_basic.test
@@ -0,0 +1,42 @@
+# ulong session
+
+SET @start_global_value = @@global.rowid_merge_buff_size;
+
+#
+# exists as global only
+#
+select @@global.rowid_merge_buff_size;
+select @@session.rowid_merge_buff_size;
+show global variables like 'rowid_merge_buff_size';
+show session variables like 'rowid_merge_buff_size';
+select * from information_schema.global_variables where variable_name='rowid_merge_buff_size';
+select * from information_schema.session_variables where variable_name='rowid_merge_buff_size';
+
+#
+# show that it's writable
+#
+set global rowid_merge_buff_size=10;
+select @@global.rowid_merge_buff_size;
+set session rowid_merge_buff_size=10;
+select @@session.rowid_merge_buff_size;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global rowid_merge_buff_size=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set session rowid_merge_buff_size=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global rowid_merge_buff_size="foo";
+
+#
+# min/max values, block size
+#
+set global rowid_merge_buff_size=0;
+select @@global.rowid_merge_buff_size;
+set session rowid_merge_buff_size=cast(-1 as unsigned int);
+select @@session.rowid_merge_buff_size;
+
+SET @@global.rowid_merge_buff_size = @start_global_value;
+
diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic-master.opt b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic-master.opt
deleted file mode 100644
index 58029d28ace..00000000000
--- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic-master.opt
+++ /dev/null
@@ -1 +0,0 @@
-$SEMISYNC_PLUGIN_OPT
diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic.test b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic.test
index 43954d6441d..ded489f36ff 100644
--- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic.test
+++ b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic.test
@@ -9,7 +9,7 @@ source include/not_embedded.inc;
 source include/have_semisync_plugin.inc;
 # The following is to prevent a mis-match on windows that has the name of of the lib ending with 'dll' 
 --replace_regex /\.dll/.so/
-eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
+eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_SO';
 select @@global.rpl_semi_sync_master_enabled;
 SET @start_global_value = @@global.rpl_semi_sync_master_enabled;
 
diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic-master.opt b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic-master.opt
deleted file mode 100644
index 58029d28ace..00000000000
--- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic-master.opt
+++ /dev/null
@@ -1 +0,0 @@
-$SEMISYNC_PLUGIN_OPT
diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic.test b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic.test
index 0d085412a00..5258894150d 100644
--- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic.test
+++ b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic.test
@@ -8,7 +8,7 @@ source include/not_embedded.inc;
 source include/have_semisync_plugin.inc;
 # The following is to prevent a mis-match on windows that has the name of of the lib ending with 'dll' 
 --replace_regex /\.dll/.so/
-eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
+eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_SO';
 select @@global.rpl_semi_sync_master_timeout;
 SET @start_global_value = @@global.rpl_semi_sync_master_timeout;
 
diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic-master.opt b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic-master.opt
deleted file mode 100644
index 58029d28ace..00000000000
--- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic-master.opt
+++ /dev/null
@@ -1 +0,0 @@
-$SEMISYNC_PLUGIN_OPT
diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic.test b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic.test
index c3f538f8dba..d9b1d860b35 100644
--- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic.test
+++ b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic.test
@@ -8,7 +8,7 @@ source include/not_embedded.inc;
 source include/have_semisync_plugin.inc;
 # The following is to prevent a mis-match on windows that has the name of of the lib ending with 'dll' 
 --replace_regex /\.dll/.so/
-eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
+eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_SO';
 select @@global.rpl_semi_sync_master_trace_level;
 SET @start_global_value = @@global.rpl_semi_sync_master_trace_level;
 
diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic-master.opt b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic-master.opt
deleted file mode 100644
index 58029d28ace..00000000000
--- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic-master.opt
+++ /dev/null
@@ -1 +0,0 @@
-$SEMISYNC_PLUGIN_OPT
diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic.test b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic.test
index 1db772dec61..896bd50d156 100644
--- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic.test
+++ b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic.test
@@ -9,7 +9,7 @@ source include/not_embedded.inc;
 source include/have_semisync_plugin.inc;
 # The following is to prevent a mis-match on windows that has the name of of the lib ending with 'dll' 
 --replace_regex /\.dll/.so/
-eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
+eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_SO';
 select @@global.rpl_semi_sync_master_wait_no_slave;
 SET @start_global_value = @@global.rpl_semi_sync_master_wait_no_slave;
 
diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic-master.opt b/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic-master.opt
deleted file mode 100644
index 58029d28ace..00000000000
--- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic-master.opt
+++ /dev/null
@@ -1 +0,0 @@
-$SEMISYNC_PLUGIN_OPT
diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic.test b/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic.test
index 565139456db..030b0827a11 100644
--- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic.test
+++ b/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic.test
@@ -9,7 +9,7 @@ source include/not_embedded.inc;
 source include/have_semisync_plugin.inc;
 # The following is to prevent a mis-match on windows that has the name of of the lib ending with 'dll' 
 --replace_regex /\.dll/.so/
-eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN';
+eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_SO';
 select @@global.rpl_semi_sync_slave_enabled;
 SET @start_global_value = @@global.rpl_semi_sync_slave_enabled;
 
diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic-master.opt b/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic-master.opt
deleted file mode 100644
index 58029d28ace..00000000000
--- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic-master.opt
+++ /dev/null
@@ -1 +0,0 @@
-$SEMISYNC_PLUGIN_OPT
diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic.test b/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic.test
index ac88593f02f..64c935ee957 100644
--- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic.test
+++ b/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic.test
@@ -8,7 +8,7 @@ source include/not_embedded.inc;
 source include/have_semisync_plugin.inc;
 # The following is to prevent a mis-match on windows that has the name of of the lib ending with 'dll' 
 --replace_regex /\.dll/.so/
-eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN';
+eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_SO';
 select @@global.rpl_semi_sync_slave_trace_level;
 SET @start_global_value = @@global.rpl_semi_sync_slave_trace_level;
 
diff --git a/mysql-test/suite/sys_vars/t/storage_engine_basic.test b/mysql-test/suite/sys_vars/t/storage_engine_basic.test
index 49e8a52efea..2d1e94e6620 100644
--- a/mysql-test/suite/sys_vars/t/storage_engine_basic.test
+++ b/mysql-test/suite/sys_vars/t/storage_engine_basic.test
@@ -35,9 +35,7 @@
 #############################################################
 
 SET @start_global_value = @@global.storage_engine;
-SELECT @start_global_value;
 SET @start_session_value = @@session.storage_engine;
-SELECT @start_session_value;
 
 
 --echo '#--------------------FN_DYNVARS_005_01-------------------------#'
@@ -47,10 +45,12 @@ SELECT @start_session_value;
 
 SET @@global.storage_engine = INNODB;
 SET @@global.storage_engine = DEFAULT;
+--replace_result MyISAM InnoDB
 SELECT @@global.storage_engine;
 
 SET @@session.storage_engine = INNODB;
 SET @@session.storage_engine = DEFAULT;
+--replace_result MyISAM InnoDB
 SELECT @@session.storage_engine;
 
 
@@ -179,9 +179,7 @@ SET @@storage_engine = @start_global_value;
 ####################################
 
 SET @@global.storage_engine = @start_global_value;
-SELECT @@global.storage_engine;
 SET @@session.storage_engine = @start_session_value;
-SELECT @@session.storage_engine;
 
 
 #############################################################
diff --git a/mysql-test/suite/sys_vars/t/userstat_basic.test b/mysql-test/suite/sys_vars/t/userstat_basic.test
new file mode 100644
index 00000000000..55aa98c90c7
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/userstat_basic.test
@@ -0,0 +1,38 @@
+# bool global
+
+SET @start_global_value = @@global.userstat;
+
+#
+# exists as global only
+#
+select @@global.userstat;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.userstat;
+show global variables like 'userstat';
+show session variables like 'userstat';
+select * from information_schema.global_variables where variable_name='userstat';
+select * from information_schema.session_variables where variable_name='userstat';
+
+#
+# show that it's writable
+#
+set global userstat=ON;
+select @@global.userstat;
+set global userstat=OFF;
+select @@global.userstat;
+set global userstat=1;
+select @@global.userstat;
+--error ER_GLOBAL_VARIABLE
+set session userstat=1;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global userstat=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global userstat=1e1;
+--error ER_WRONG_VALUE_FOR_VAR
+set global userstat="foo";
+
+SET @@global.userstat = @start_global_value;
diff --git a/mysql-test/suite/vcol/inc/vcol_keys.inc b/mysql-test/suite/vcol/inc/vcol_keys.inc
index 68a40afea92..bba58363a81 100644
--- a/mysql-test/suite/vcol/inc/vcol_keys.inc
+++ b/mysql-test/suite/vcol/inc/vcol_keys.inc
@@ -96,9 +96,9 @@ if (!$skip_spatial_index_check)
 {
   --echo # Error "All parts of a SPATIAL index must be NOT NULL"
   --error ER_SPATIAL_CANT_HAVE_NULL
-  create table t1 (a int, b int as (a+1) persistent, spatial index (b));
+  create table t1 (a int, b geometry as (a+1) persistent, spatial index (b));
   create table t1 (a int, b int as (a+1) persistent);
-  --error ER_SPATIAL_CANT_HAVE_NULL
+  --error ER_SPATIAL_MUST_HAVE_GEOM_COL
   alter table t1 add spatial index (b);
   drop table t1;
 }
diff --git a/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc b/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc
index 4f6b960f9d0..78a8e8944fd 100644
--- a/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc
+++ b/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc
@@ -83,7 +83,7 @@ let $rows = 1;
 --echo # COT()
 let $cols = a double, b double as (format(cot(a),6));
 let $values1 = 12,default;
-let $values2 = 0,default;
+let $values2 = 1,default;
 let $rows = 2;
 --source suite/vcol/inc/vcol_supported_sql_funcs.inc
 
diff --git a/mysql-test/suite/vcol/r/vcol_archive.result b/mysql-test/suite/vcol/r/vcol_archive.result
index 83fb78a5592..5ca80dae7d2 100644
--- a/mysql-test/suite/vcol/r/vcol_archive.result
+++ b/mysql-test/suite/vcol/r/vcol_archive.result
@@ -1,7 +1,7 @@
 SET @@session.storage_engine = 'archive';
 create table t1 (a int, b int as (a+1));
-ERROR HY000: 'Specified storage engine' is not yet supported for computed columns
+ERROR HY000: 'ARCHIVE' is not yet supported for computed columns
 create table t1 (a int);
 alter table t1 add column b int as (a+1);
-ERROR HY000: 'Specified storage engine' is not yet supported for computed columns
+ERROR HY000: 'ARCHIVE' is not yet supported for computed columns
 drop table t1;
diff --git a/mysql-test/suite/vcol/r/vcol_blackhole.result b/mysql-test/suite/vcol/r/vcol_blackhole.result
index 15e7505aebb..dad1902643f 100644
--- a/mysql-test/suite/vcol/r/vcol_blackhole.result
+++ b/mysql-test/suite/vcol/r/vcol_blackhole.result
@@ -1,7 +1,7 @@
 SET @@session.storage_engine = 'blackhole';
 create table t1 (a int, b int as (a+1));
-ERROR HY000: 'Specified storage engine' is not yet supported for computed columns
+ERROR HY000: 'BLACKHOLE' is not yet supported for computed columns
 create table t1 (a int);
 alter table t1 add column b int as (a+1);
-ERROR HY000: 'Specified storage engine' is not yet supported for computed columns
+ERROR HY000: 'BLACKHOLE' is not yet supported for computed columns
 drop table t1;
diff --git a/mysql-test/suite/vcol/r/vcol_csv.result b/mysql-test/suite/vcol/r/vcol_csv.result
index 97977505696..2da4e330f9f 100644
--- a/mysql-test/suite/vcol/r/vcol_csv.result
+++ b/mysql-test/suite/vcol/r/vcol_csv.result
@@ -1,7 +1,7 @@
 SET @@session.storage_engine = 'CSV';
 create table t1 (a int, b int as (a+1));
-ERROR HY000: 'Specified storage engine' is not yet supported for computed columns
+ERROR HY000: 'CSV' is not yet supported for computed columns
 create table t1 (a int not null);
 alter table t1 add column b int as (a+1);
-ERROR HY000: 'Specified storage engine' is not yet supported for computed columns
+ERROR HY000: 'CSV' is not yet supported for computed columns
 drop table t1;
diff --git a/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result b/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result
index 161a82171ce..3628139bd03 100644
--- a/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result
+++ b/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result
@@ -25,8 +25,8 @@ a	b	c
 # INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols
 insert into t1 values (1,2,3);
 Warnings:
-Warning	1647	The value specified for computed column 'b' in table 't1' ignored
-Warning	1647	The value specified for computed column 'c' in table 't1' ignored
+Warning	1703	The value specified for computed column 'b' in table 't1' ignored
+Warning	1703	The value specified for computed column 'c' in table 't1' ignored
 select * from t1;
 a	b	c
 1	-1	-1
@@ -65,8 +65,8 @@ a	b	c
 # against vcols
 insert into t1 (a,b) values (1,3), (2,4);
 Warnings:
-Warning	1647	The value specified for computed column 'b' in table 't1' ignored
-Warning	1647	The value specified for computed column 'b' in table 't1' ignored
+Warning	1703	The value specified for computed column 'b' in table 't1' ignored
+Warning	1703	The value specified for computed column 'b' in table 't1' ignored
 select * from t1;
 a	b	c
 1	-1	-1
@@ -107,8 +107,8 @@ a	b	c
 create table t2 like t1;
 insert into t2 select * from t1;
 Warnings:
-Warning	1647	The value specified for computed column 'b' in table 't2' ignored
-Warning	1647	The value specified for computed column 'c' in table 't2' ignored
+Warning	1703	The value specified for computed column 'b' in table 't2' ignored
+Warning	1703	The value specified for computed column 'c' in table 't2' ignored
 select * from t1;
 a	b	c
 2	-2	-2
@@ -123,8 +123,8 @@ a	b	c
 create table t2 like t1;
 insert into t2 (a,b) select a,b from t1;
 Warnings:
-Warning	1647	The value specified for computed column 'b' in table 't2' ignored
-Warning	1647	The value specified for computed column 'b' in table 't2' ignored
+Warning	1703	The value specified for computed column 'b' in table 't2' ignored
+Warning	1703	The value specified for computed column 'b' in table 't2' ignored
 select * from t2;
 a	b	c
 2	-2	-2
@@ -159,7 +159,7 @@ a	b	c
 2	-2	-2
 update t1 set c=3 where a=2;
 Warnings:
-Warning	1647	The value specified for computed column 'c' in table 't1' ignored
+Warning	1703	The value specified for computed column 'c' in table 't1' ignored
 select * from t1;
 a	b	c
 1	-1	-1
@@ -189,7 +189,7 @@ a	b	c
 2	-2	-2
 update t1 set c=3 where b=-2;
 Warnings:
-Warning	1647	The value specified for computed column 'c' in table 't1' ignored
+Warning	1703	The value specified for computed column 'c' in table 't1' ignored
 select * from t1;
 a	b	c
 1	-1	-1
diff --git a/mysql-test/suite/vcol/r/vcol_keys_myisam.result b/mysql-test/suite/vcol/r/vcol_keys_myisam.result
index af0935affbc..f44d306312d 100644
--- a/mysql-test/suite/vcol/r/vcol_keys_myisam.result
+++ b/mysql-test/suite/vcol/r/vcol_keys_myisam.result
@@ -100,11 +100,11 @@ drop table t1;
 # TODO: FULLTEXT INDEX
 # SPATIAL INDEX
 # Error "All parts of a SPATIAL index must be NOT NULL"
-create table t1 (a int, b int as (a+1) persistent, spatial index (b));
+create table t1 (a int, b geometry as (a+1) persistent, spatial index (b));
 ERROR 42000: All parts of a SPATIAL index must be NOT NULL
 create table t1 (a int, b int as (a+1) persistent);
 alter table t1 add spatial index (b);
-ERROR 42000: All parts of a SPATIAL index must be NOT NULL
+ERROR 42000: A SPATIAL index may only contain a geometrical type column
 drop table t1;
 # FOREIGN KEY
 # Rejected FK options.
diff --git a/mysql-test/suite/vcol/r/vcol_memory.result b/mysql-test/suite/vcol/r/vcol_memory.result
index 30b6bd4a4bf..8cfb21f3930 100644
--- a/mysql-test/suite/vcol/r/vcol_memory.result
+++ b/mysql-test/suite/vcol/r/vcol_memory.result
@@ -1,7 +1,7 @@
 SET @@session.storage_engine = 'memory';
 create table t1 (a int, b int as (a+1));
-ERROR HY000: 'Specified storage engine' is not yet supported for computed columns
+ERROR HY000: 'MEMORY' is not yet supported for computed columns
 create table t1 (a int);
 alter table t1 add column b int as (a+1);
-ERROR HY000: 'Specified storage engine' is not yet supported for computed columns
+ERROR HY000: 'MEMORY' is not yet supported for computed columns
 drop table t1;
diff --git a/mysql-test/suite/vcol/r/vcol_merge.result b/mysql-test/suite/vcol/r/vcol_merge.result
index 03a1e151c2e..5cc2286a31a 100644
--- a/mysql-test/suite/vcol/r/vcol_merge.result
+++ b/mysql-test/suite/vcol/r/vcol_merge.result
@@ -4,5 +4,5 @@ create table t2 (a int, b int as (a % 10));
 insert into t1 values (1,default);
 insert into t2 values (2,default);
 create table t3 (a int, b int as (a % 10)) engine=MERGE UNION=(t1,t2);
-ERROR HY000: 'Specified storage engine' is not yet supported for computed columns
+ERROR HY000: 'MRG_MYISAM' is not yet supported for computed columns
 drop table t1,t2;
diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result
index a460b8da709..0cdd0029b85 100644
--- a/mysql-test/suite/vcol/r/vcol_misc.result
+++ b/mysql-test/suite/vcol/r/vcol_misc.result
@@ -108,10 +108,10 @@ DROP TABLE t1,t2;
 CREATE TABLE t1 (p int, a double NOT NULL, v double AS (ROUND(a,p)) VIRTUAL);
 INSERT INTO t1 VALUES (0,1,0);
 Warnings:
-Warning	1647	The value specified for computed column 'v' in table 't1' ignored
+Warning	1703	The value specified for computed column 'v' in table 't1' ignored
 INSERT INTO t1 VALUES (NULL,0,0);
 Warnings:
-Warning	1647	The value specified for computed column 'v' in table 't1' ignored
+Warning	1703	The value specified for computed column 'v' in table 't1' ignored
 SELECT a, p, v, ROUND(a,p), ROUND(a,p+NULL) FROM t1;
 a	p	v	ROUND(a,p)	ROUND(a,p+NULL)
 1	0	1	1	NULL
diff --git a/mysql-test/suite/vcol/r/vcol_select_myisam.result b/mysql-test/suite/vcol/r/vcol_select_myisam.result
index e7c01abc3ac..cee28007caa 100644
--- a/mysql-test/suite/vcol/r/vcol_select_myisam.result
+++ b/mysql-test/suite/vcol/r/vcol_select_myisam.result
@@ -53,7 +53,7 @@ a	b	c	a	b	c
 explain select * from t1,t3 where t1.c=t3.c and t3.c=-1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t3	const	c	c	5	const	1	
-1	SIMPLE	t1	ref	c	c	5	const	2	
+1	SIMPLE	t1	ref	c	c	5	const	2	Using index condition
 # select_type=PRIMARY, type=index,ALL
 select * from t1 where b in (select c from t3);
 a	b	c
@@ -130,7 +130,7 @@ count(distinct c)
 3
 explain select count(distinct c) from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	NULL	c	5	NULL	5	Using index
+1	SIMPLE	t1	range	NULL	c	5	NULL	6	Using index for group-by (scanning)
 ###
 ### filesort & range-based utils
 ###
diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result
index 844aae38af2..ce6bd7eed40 100644
--- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result
+++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result
@@ -170,11 +170,11 @@ t1	CREATE TABLE `t1` (
   `b` double AS (format(cot(a),6)) VIRTUAL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values (12,default);
-insert into t1 values (0,default);
+insert into t1 values (1,default);
 select * from t1;
 a	b
 12	-1.572673
-0	NULL
+1	0.642093
 drop table t1;
 set sql_warnings = 0;
 # CRC32()
diff --git a/mysql-test/suite/vcol/r/vcol_view_myisam.result b/mysql-test/suite/vcol/r/vcol_view_myisam.result
index bd5999792ff..72325939c20 100644
--- a/mysql-test/suite/vcol/r/vcol_view_myisam.result
+++ b/mysql-test/suite/vcol/r/vcol_view_myisam.result
@@ -266,8 +266,8 @@ insert into v1 (a) values (3);
 ERROR HY000: CHECK OPTION failed 'test.v1'
 insert ignore into v1 (a) values (2),(3),(0);
 Warnings:
-Error	1369	CHECK OPTION failed 'test.v1'
-Error	1369	CHECK OPTION failed 'test.v1'
+Warning	1369	CHECK OPTION failed 'test.v1'
+Warning	1369	CHECK OPTION failed 'test.v1'
 select * from t1;
 a	b	c
 1	-1	-1
diff --git a/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_innodb.test b/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_innodb.test
index 516e121a2aa..baefddc0fd1 100644
--- a/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_innodb.test
@@ -32,7 +32,7 @@
 
 ##### Storage engine to be tested
 # Set the session storage engine
---source include/have_innodb.inc
+--source include/have_xtradb.inc
 eval SET @@session.storage_engine = 'InnoDB';
 
 let $skip_full_text_checks = 1;
diff --git a/mysql-test/suite/vcol/t/vcol_column_def_options_innodb.test b/mysql-test/suite/vcol/t/vcol_column_def_options_innodb.test
index 38baa2b3024..e11618163cc 100644
--- a/mysql-test/suite/vcol/t/vcol_column_def_options_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_column_def_options_innodb.test
@@ -33,7 +33,7 @@
 
 ##### Storage engine to be tested
 # Set the session storage engine
---source include/have_innodb.inc
+--source include/have_xtradb.inc
 eval SET @@session.storage_engine = 'InnoDB';
 
 ##### Workarounds for known open engine specific bugs
diff --git a/mysql-test/suite/vcol/t/vcol_handler_innodb.test b/mysql-test/suite/vcol/t/vcol_handler_innodb.test
index bf443c6bbd3..1a50aeaaa86 100644
--- a/mysql-test/suite/vcol/t/vcol_handler_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_handler_innodb.test
@@ -33,7 +33,7 @@
 
 ##### Storage engine to be tested
 # Set the session storage engine
---source include/have_innodb.inc
+--source include/have_xtradb.inc
 eval SET @@session.storage_engine = 'InnoDB';
 
 ##### Workarounds for known open engine specific bugs
diff --git a/mysql-test/suite/vcol/t/vcol_ins_upd_innodb.test b/mysql-test/suite/vcol/t/vcol_ins_upd_innodb.test
index 5d9ac12e930..3b83c7f4565 100644
--- a/mysql-test/suite/vcol/t/vcol_ins_upd_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_ins_upd_innodb.test
@@ -33,7 +33,7 @@
 
 ##### Storage engine to be tested
 # Set the session storage engine
---source include/have_innodb.inc
+--source include/have_xtradb.inc
 eval SET @@session.storage_engine = 'InnoDB';
 
 ##### Workarounds for known open engine specific bugs
diff --git a/mysql-test/suite/vcol/t/vcol_keys_innodb.test b/mysql-test/suite/vcol/t/vcol_keys_innodb.test
index e408672ac07..d44d2f701cf 100644
--- a/mysql-test/suite/vcol/t/vcol_keys_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_keys_innodb.test
@@ -33,7 +33,7 @@
 
 ##### Storage engine to be tested
 # Set the session storage engine
---source include/have_innodb.inc
+--source include/have_xtradb.inc
 eval SET @@session.storage_engine = 'InnoDB';
 
 ##### Workarounds for known open engine specific bugs
diff --git a/mysql-test/suite/vcol/t/vcol_non_stored_columns_innodb.test b/mysql-test/suite/vcol/t/vcol_non_stored_columns_innodb.test
index 88ed6157294..42834d5c0bb 100644
--- a/mysql-test/suite/vcol/t/vcol_non_stored_columns_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_non_stored_columns_innodb.test
@@ -35,7 +35,7 @@
 
 ##### Storage engine to be tested
 # Set the session storage engine
---source include/have_innodb.inc
+--source include/have_xtradb.inc
 eval SET @@session.storage_engine = 'InnoDB';
 
 ##### Workarounds for known open engine specific bugs
diff --git a/mysql-test/suite/vcol/t/vcol_partition_innodb.test b/mysql-test/suite/vcol/t/vcol_partition_innodb.test
index 01230120ef9..47f1581fc96 100644
--- a/mysql-test/suite/vcol/t/vcol_partition_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_partition_innodb.test
@@ -34,7 +34,7 @@
 
 ##### Storage engine to be tested
 # Set the session storage engine
---source include/have_innodb.inc
+--source include/have_xtradb.inc
 eval SET @@session.storage_engine = 'InnoDB';
 
 ##### Workarounds for known open engine specific bugs
diff --git a/mysql-test/suite/vcol/t/vcol_select_innodb.test b/mysql-test/suite/vcol/t/vcol_select_innodb.test
index 314aecb75b9..787f5fe77a7 100644
--- a/mysql-test/suite/vcol/t/vcol_select_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_select_innodb.test
@@ -33,7 +33,7 @@
 
 ##### Storage engine to be tested
 # Set the session storage engine
---source include/have_innodb.inc
+--source include/have_xtradb.inc
 eval SET @@session.storage_engine = 'InnoDB';
 
 ##### Workarounds for known open engine specific bugs
diff --git a/mysql-test/suite/vcol/t/vcol_supported_sql_funcs_innodb.test b/mysql-test/suite/vcol/t/vcol_supported_sql_funcs_innodb.test
index 53826a460a7..32e2600c2fc 100644
--- a/mysql-test/suite/vcol/t/vcol_supported_sql_funcs_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_supported_sql_funcs_innodb.test
@@ -32,7 +32,7 @@
 
 ##### Storage engine to be tested
 # Set the session storage engine
---source include/have_innodb.inc
+--source include/have_xtradb.inc
 SET @@session.storage_engine = 'InnoDB';
 
 ##### Workarounds for known open engine specific bugs
diff --git a/mysql-test/suite/vcol/t/vcol_trigger_sp_innodb.test b/mysql-test/suite/vcol/t/vcol_trigger_sp_innodb.test
index 5a36fb1c06d..57655d6d3fe 100644
--- a/mysql-test/suite/vcol/t/vcol_trigger_sp_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_trigger_sp_innodb.test
@@ -34,7 +34,7 @@
 
 ##### Storage engine to be tested
 # Set the session storage engine
---source include/have_innodb.inc
+--source include/have_xtradb.inc
 eval SET @@session.storage_engine = 'InnoDB';
 
 ##### Workarounds for known open engine specific bugs
diff --git a/mysql-test/suite/vcol/t/vcol_view_innodb.test b/mysql-test/suite/vcol/t/vcol_view_innodb.test
index 01fced8e4c3..322fb122436 100644
--- a/mysql-test/suite/vcol/t/vcol_view_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_view_innodb.test
@@ -33,7 +33,7 @@
 
 ##### Storage engine to be tested
 # Set the session storage engine
---source include/have_innodb.inc
+--source include/have_xtradb.inc
 eval SET @@session.storage_engine = 'InnoDB';
 
 ##### Workarounds for known open engine specific bugs
author	Sergei Golubchik <sergii@pisem.net>	2011-04-25 17:22:25 +0200
committer	Sergei Golubchik <sergii@pisem.net>	2011-04-25 17:22:25 +0200
commit	0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch)
tree	bdf0738c29dc1f57fbfba3a1754524e238f15b52 /mysql-test/suite
parent	37f87d73ae8dc6c30594867b40a5d70159acf63c (diff)
download	mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz