Merge 5.1-rpl-testfixes -> 5.1-rpl

243 files changed, 613 insertions, 352 deletions

diff --git a/mysql-test/extra/binlog_tests/binlog_insert_delayed.test b/mysql-test/extra/binlog_tests/binlog_insert_delayed.test
index d073c8ef227..c99d0b86be3 100644
--- a/mysql-test/extra/binlog_tests/binlog_insert_delayed.test
+++ b/mysql-test/extra/binlog_tests/binlog_insert_delayed.test
@@ -1,17 +1,43 @@
-# Test of binlogging of INSERT_ID with INSERT DELAYED
+# ==== Purpose ====
+#
+# Verify that INSERT DELAYED in mixed or row mode writes events to the
+# binlog, and that AUTO_INCREMENT works correctly.
+#
+# ==== Method ====
+#
+# Insert both single and multiple rows into an autoincrement column,
+# both with specified value and with NULL.
+#
+# With INSERT DELAYED, the rows do not show up in the table
+# immediately, so we must do source include/wait_until_rows_count.inc
+# between any two INSERT DELAYED statements.  Moreover, if mixed or
+# row-based logging is used, there is also a delay between when rows
+# show up in the table and when they show up in the binlog.  To ensure
+# that the rows show up in the binlog, we call FLUSH TABLES, which
+# waits until the delayed_insert thread has finished.
+#
+# We cannot read the binlog after executing INSERT DELAYED statements
+# that insert multiple rows, because that is nondeterministic. More
+# precisely, rows may be written in batches to the binlog, where each
+# batch has one Table_map_log_event and one or more
+# Write_rows_log_event. The number of rows included in each batch is
+# nondeterministic.
+#
+# ==== Related bugs ====
+#
+# BUG#20627: INSERT DELAYED does not honour auto_increment_* variables
+# Bug in this test: BUG#38068: binlog_stm_binlog fails sporadically in pushbuild
+
+
 create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
-# First, avoid BUG#20627:
-set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
-# Verify that only one INSERT_ID event is binlogged.
-# Note, that because of WL#3368 mixed mode binlog records RBR events for the delayed
-let $table=t1;
-let $rows_inserted=11; # total number of inserted rows in this test
-insert delayed into t1 values (207);
-let $count=1;
 
-# use this macro instead of sleeps.
+let $table=t1;
+let $count=0;
 
+insert delayed into t1 values (207);
+inc $count;
 --source include/wait_until_rows_count.inc
+
 insert delayed into t1 values (null);
 inc $count;
 --source include/wait_until_rows_count.inc
@@ -20,9 +46,10 @@ insert delayed into t1 values (300);
 inc $count;
 --source include/wait_until_rows_count.inc
 
-# moving binlog check affront of multi-rows queries which work is indeterministic (extra table_maps)
-# todo: better check is to substitute SHOW BINLOG with reading from binlog, probably bug#19459 is in
-# the way
+# It is not enough to wait until all rows have been inserted into the
+# table. FLUSH TABLES ensures that they are in the binlog too.  See
+# comment above.
+FLUSH TABLES;
 source include/show_binlog_events.inc;
 
 insert delayed into t1 values (null),(null),(null),(null);
@@ -33,8 +60,5 @@ insert delayed into t1 values (null),(null),(400),(null);
 inc $count; inc $count; inc $count; inc $count;
 --source include/wait_until_rows_count.inc
 
-#check this assertion about $count calculation
---echo $count == $rows_inserted
-
 select * from t1;
 drop table t1;
diff --git a/mysql-test/extra/rpl_tests/rpl_row_basic.test b/mysql-test/extra/rpl_tests/rpl_row_basic.test
index 4be7ad54cb3..534842218b9 100644
--- a/mysql-test/extra/rpl_tests/rpl_row_basic.test
+++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test
@@ -309,51 +309,52 @@ sync_slave_with_master;
 # 7. Replicating UTF-8 CHAR(255) to CHAR(255) UTF-8
 
 connection master;
-CREATE TABLE t1 (i INT NOT NULL,
-                 c CHAR(16) CHARACTER SET utf8 NOT NULL,
-                 j INT NOT NULL);
+eval CREATE TABLE t1 (i INT NOT NULL,
+                      c CHAR(16) CHARACTER SET utf8 NOT NULL,
+                      j INT NOT NULL) ENGINE = $type ;
 
-CREATE TABLE t2 (i INT NOT NULL,
-                 c CHAR(16) CHARACTER SET utf8 NOT NULL,
-                 j INT NOT NULL);
+eval CREATE TABLE t2 (i INT NOT NULL,
+                      c CHAR(16) CHARACTER SET utf8 NOT NULL,
+                      j INT NOT NULL) ENGINE = $type ;
 
 sync_slave_with_master;
 ALTER TABLE t2 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
 
 connection master;
-CREATE TABLE t3 (i INT NOT NULL,
-                 c CHAR(128) CHARACTER SET utf8 NOT NULL,
-                 j INT NOT NULL);
+eval CREATE TABLE t3 (i INT NOT NULL,
+                      c CHAR(128) CHARACTER SET utf8 NOT NULL,
+                      j INT NOT NULL) ENGINE = $type ;
 sync_slave_with_master;
 ALTER TABLE t3 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
 
 connection master;
-CREATE TABLE t4 (i INT NOT NULL,
-                 c CHAR(128) CHARACTER SET utf8 NOT NULL,
-                 j INT NOT NULL);
+eval CREATE TABLE t4 (i INT NOT NULL,
+                      c CHAR(128) CHARACTER SET utf8 NOT NULL,
+                      j INT NOT NULL) ENGINE = $type ;
 
-CREATE TABLE t5 (i INT NOT NULL,
-                 c CHAR(255) CHARACTER SET utf8 NOT NULL,
-                 j INT NOT NULL);
+eval CREATE TABLE t5 (i INT NOT NULL,
+                      c CHAR(255) CHARACTER SET utf8 NOT NULL,
+                      j INT NOT NULL) ENGINE = $type ;
 sync_slave_with_master;
 ALTER TABLE t5 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
 
 connection master;
-CREATE TABLE t6 (i INT NOT NULL,
-                 c CHAR(255) CHARACTER SET utf8 NOT NULL,
-                 j INT NOT NULL);
+eval CREATE TABLE t6 (i INT NOT NULL,
+                      c CHAR(255) CHARACTER SET utf8 NOT NULL,
+                      j INT NOT NULL) ENGINE = $type ;
 sync_slave_with_master;
 ALTER TABLE t6 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
 
 connection master;
-CREATE TABLE t7 (i INT NOT NULL,
-                 c CHAR(255) CHARACTER SET utf8 NOT NULL,
-                 j INT NOT NULL);
+eval CREATE TABLE t7 (i INT NOT NULL,
+                      c CHAR(255) CHARACTER SET utf8 NOT NULL,
+                      j INT NOT NULL) ENGINE = $type ;
 
 --echo [expecting slave to replicate correctly]
 connection master;
 INSERT INTO t1 VALUES (1, "", 1);
 INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2);
+sync_slave_with_master;
 
 let $diff_table_1=master:test.t1;
 let $diff_table_2=slave:test.t1;
@@ -363,6 +364,7 @@ source include/diff_tables.inc;
 connection master;
 INSERT INTO t2 VALUES (1, "", 1);
 INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2);
+sync_slave_with_master;
 
 let $diff_table_1=master:test.t2;
 let $diff_table_2=slave:test.t2;
@@ -379,7 +381,11 @@ let $last_error = query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1);
 disable_query_log;
 eval SELECT "$last_error" AS Last_SQL_Error;
 enable_query_log;
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+connection master;
+RESET MASTER;
+connection slave;
+STOP SLAVE;
+RESET SLAVE;
 START SLAVE;
 source include/wait_for_slave_to_start.inc;
 
@@ -387,6 +393,7 @@ source include/wait_for_slave_to_start.inc;
 connection master;
 INSERT INTO t4 VALUES (1, "", 1);
 INSERT INTO t4 VALUES (2, repeat(_utf8'a', 128), 2);
+sync_slave_with_master;
 
 let $diff_table_1=master:test.t4;
 let $diff_table_2=slave:test.t4;
@@ -403,7 +410,11 @@ let $last_error = query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1);
 disable_query_log;
 eval SELECT "$last_error" AS Last_SQL_Error;
 enable_query_log;
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+connection master;
+RESET MASTER;
+connection slave;
+STOP SLAVE;
+RESET SLAVE;
 START SLAVE;
 source include/wait_for_slave_to_start.inc;
 
@@ -418,7 +429,11 @@ let $last_error = query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1);
 disable_query_log;
 eval SELECT "$last_error" AS Last_SQL_Error;
 enable_query_log;
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+connection master;
+RESET MASTER;
+connection slave;
+STOP SLAVE;
+RESET SLAVE;
 START SLAVE;
 source include/wait_for_slave_to_start.inc;
 
@@ -426,6 +441,7 @@ source include/wait_for_slave_to_start.inc;
 connection master;
 INSERT INTO t7 VALUES (1, "", 1);
 INSERT INTO t7 VALUES (2, repeat(_utf8'a', 255), 2);
+sync_slave_with_master;
 
 let $diff_table_1=master:test.t7;
 let $diff_table_2=slave:test.t7;
diff --git a/mysql-test/include/show_binlog_events.inc b/mysql-test/include/show_binlog_events.inc
index a80dc75df7d..68f913a16a3 100644
--- a/mysql-test/include/show_binlog_events.inc
+++ b/mysql-test/include/show_binlog_events.inc
@@ -4,7 +4,7 @@ if (!$binlog_start)
 {
   let $binlog_start=106;
 }
---replace_result $binlog_start <binlog_start>
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start <binlog_start>
 --replace_column 2 # 4 # 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/
 --eval show binlog events from $binlog_start
diff --git a/mysql-test/r/func_if.result b/mysql-test/r/func_if.result
index 42a2aa840ea..62d34c5ce8f 100644
--- a/mysql-test/r/func_if.result
+++ b/mysql-test/r/func_if.result
@@ -131,3 +131,49 @@ drop table t1;
 select if(0, 18446744073709551610, 18446744073709551610);
 if(0, 18446744073709551610, 18446744073709551610)
 18446744073709551610
+CREATE TABLE t1(a DECIMAL(10,3));
+SELECT t1.a,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,0)))))))))))))))))))))))))))))) + 1
+FROM t1;
+a	IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((ROUND(t1.a,2)=1), 2,
+IF((R
+DROP TABLE t1;
+End of 5.0 tests
diff --git a/mysql-test/r/innodb-autoinc-optimize.result b/mysql-test/r/innodb-autoinc-optimize.result
new file mode 100644
index 00000000000..61739f0713a
--- /dev/null
+++ b/mysql-test/r/innodb-autoinc-optimize.result
@@ -0,0 +1,6 @@
+drop table if exists t1;
+create table t1(a int not null auto_increment primary key) engine=innodb;
+insert into t1 set a = -1;
+optimize table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	status	OK
diff --git a/mysql-test/r/innodb_bug35220.result b/mysql-test/r/innodb_bug35220.result
new file mode 100644
index 00000000000..195775f74c8
--- /dev/null
+++ b/mysql-test/r/innodb_bug35220.result
@@ -0,0 +1 @@
+SET storage_engine=InnoDB;
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index d076401f4d7..395cc916ab6 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -4398,4 +4398,15 @@ INSERT INTO t1 VALUES (1), (3);
 SELECT * FROM t2 WHERE b NOT IN (SELECT max(t.c) FROM t1, t1 t WHERE t.c>10);
 a	b
 DROP TABLE t1,t2;
-End of 5.0 tests.
+CREATE TABLE t1(pk int PRIMARY KEY, a int, INDEX idx(a));
+INSERT INTO t1 VALUES (1, 10), (3, 30), (2, 20);
+CREATE TABLE t2(pk int PRIMARY KEY, a int, b int, INDEX idxa(a));
+INSERT INTO t2 VALUES (2, 20, 700), (1, 10, 200), (4, 10, 100);
+SELECT * FROM t1
+WHERE EXISTS (SELECT DISTINCT a FROM t2 WHERE t1.a < t2.a ORDER BY b);
+pk	a
+1	10
+3	30
+2	20
+DROP TABLE t1,t2;
+End of 5.1 tests.
diff --git a/mysql-test/suite/binlog/r/binlog_killed_simulate.result b/mysql-test/suite/binlog/r/binlog_killed_simulate.result
index daedd4051fc..703833fb2a3 100644
--- a/mysql-test/suite/binlog/r/binlog_killed_simulate.result
+++ b/mysql-test/suite/binlog/r/binlog_killed_simulate.result
@@ -18,8 +18,8 @@ load data infile '../../std_data/rpl_loaddata.dat' into table t2 /* will be "kil
 ERROR 70100: Query execution was interrupted
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=12
-master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../../std_data/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */ ;file_id=#
+master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
+master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */ ;file_id=#
 select
 (@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
 is not null;
diff --git a/mysql-test/suite/binlog/r/binlog_row_binlog.result b/mysql-test/suite/binlog/r/binlog_row_binlog.result
index f830b69bf9d..9668c7ce5ea 100644
--- a/mysql-test/suite/binlog/r/binlog_row_binlog.result
+++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result
@@ -1141,10 +1141,10 @@ master-bin.000001	#	Delete_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	use `mysql`; COMMIT
 drop table t1,t2,t3,tt1;
 create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
-set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
 insert delayed into t1 values (207);
 insert delayed into t1 values (null);
 insert delayed into t1 values (300);
+FLUSH TABLES;
 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 (id tinyint auto_increment primary key)
@@ -1188,9 +1188,9 @@ master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; FLUSH TABLES
 insert delayed into t1 values (null),(null),(null),(null);
 insert delayed into t1 values (null),(null),(400),(null);
-11 == 11
 select * from t1;
 a
 207
diff --git a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
index a422a8b8ea2..48b682160af 100644
--- a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
+++ b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
@@ -926,7 +926,7 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=10
 master-bin.000001	#	User var	#	#	@`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
-master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=12
+master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
 master-bin.000001	#	Intvar	#	#	INSERT_ID=10
 master-bin.000001	#	User var	#	#	@`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
 master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../../std_data/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2) ;file_id=#
diff --git a/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result b/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result
index 3a2dc441632..800bb58e9cc 100644
--- a/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result
+++ b/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result
@@ -1,8 +1,8 @@
 create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
-set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
 insert delayed into t1 values (207);
 insert delayed into t1 values (null);
 insert delayed into t1 values (300);
+FLUSH TABLES;
 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 (a int not null auto_increment, primary key (a)) engine=myisam
@@ -10,9 +10,9 @@ master-bin.000001	#	Query	#	#	use `test`; insert delayed into t1 values (207)
 master-bin.000001	#	Intvar	#	#	INSERT_ID=208
 master-bin.000001	#	Query	#	#	use `test`; insert delayed into t1 values (null)
 master-bin.000001	#	Query	#	#	use `test`; insert delayed into t1 values (300)
+master-bin.000001	#	Query	#	#	use `test`; FLUSH TABLES
 insert delayed into t1 values (null),(null),(null),(null);
 insert delayed into t1 values (null),(null),(400),(null);
-11 == 11
 select * from t1;
 a
 207
diff --git a/mysql-test/suite/binlog/r/binlog_stm_binlog.result b/mysql-test/suite/binlog/r/binlog_stm_binlog.result
index 20d7281d5cc..ae8c1e11737 100644
--- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result
@@ -629,10 +629,10 @@ master-bin.000001	#	Query	#	#	use `mysql`; UPDATE user SET password=password('An
 master-bin.000001	#	Query	#	#	use `mysql`; DELETE FROM user WHERE host='localhost' AND user='@#@'
 drop table t1,t2,t3,tt1;
 create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
-set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
 insert delayed into t1 values (207);
 insert delayed into t1 values (null);
 insert delayed into t1 values (300);
+FLUSH TABLES;
 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 (id tinyint auto_increment primary key)
@@ -660,9 +660,9 @@ master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; FLUSH TABLES
 insert delayed into t1 values (null),(null),(null),(null);
 insert delayed into t1 values (null),(null),(400),(null);
-11 == 11
 select * from t1;
 a
 207
diff --git a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
index f04205b70eb..6d943ed9da1 100644
--- a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
@@ -623,7 +623,7 @@ show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=10
-master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=12
+master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
 master-bin.000001	#	Intvar	#	#	INSERT_ID=10
 master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../../std_data/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2) ;file_id=#
 master-bin.000001	#	Query	#	#	use `test`; ROLLBACK
@@ -858,7 +858,7 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=10
 master-bin.000001	#	User var	#	#	@`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
-master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=12
+master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
 master-bin.000001	#	Intvar	#	#	INSERT_ID=10
 master-bin.000001	#	User var	#	#	@`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
 master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../../std_data/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2) ;file_id=#
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_03.inc b/mysql-test/suite/funcs_1/triggers/triggers_03.inc
index f8a83315f0c..9ef6a9ac9af 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_03.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03.inc
@@ -13,12 +13,7 @@
 USE test;
 --source suite/funcs_1/include/tb3.inc
 
-# This test cannot be used for the embedded server because we check here
-# privilgeges.
---source include/not_embedded.inc
 
-USE test;
---source suite/funcs_1/include/tb3.inc
 
 --disable_abort_on_error
 
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_08.inc b/mysql-test/suite/funcs_1/triggers/triggers_08.inc
index 399b27508db..087f18e8e6b 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_08.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_08.inc
@@ -8,8 +8,7 @@
 USE test;
 --source suite/funcs_1/include/tb3.inc
 
-USE test;
---source suite/funcs_1/include/tb3.inc
+
 
 # General setup for Trigger tests
 let $message= Testcase: 3.5:;
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
index 529eb6c77fd..7230f240e2d 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
@@ -13,13 +13,6 @@ eval
 load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb3.txt'
 into table tb3;
 
-USE test;
---source suite/funcs_1/include/tb3.inc
-
---replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval
-load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb3.txt'
-into table tb3;
 
 --disable_abort_on_error
 
diff --git a/mysql-test/suite/rpl/r/rpl_loaddata_map.result b/mysql-test/suite/rpl/r/rpl_loaddata_map.result
index 7078389c987..901f3352b44 100644
--- a/mysql-test/suite/rpl/r/rpl_loaddata_map.result
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_map.result
@@ -4,6 +4,8 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+==== Create a big file ====
+==== Load our big file into a table ====
 create table t2 (id int not null primary key auto_increment);
 select @@session.read_buffer_size - @@session.max_allowed_packet > 0 ;
 @@session.read_buffer_size - @@session.max_allowed_packet > 0
@@ -12,15 +14,18 @@ load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2;
 select count(*) from t2 /* 5 000 */;
 count(*)
 5000
-show binlog events in 'master-bin.000002' from <binlog_start>;
+show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000002	#	Query	#	#	use `test`; create table t2 (id int not null primary key auto_increment)
-master-bin.000002	#	Begin_load_query	#	#	;file_id=#;block_len=#
-master-bin.000002	#	Append_block	#	#	;file_id=#;block_len=#
-master-bin.000002	#	Append_block	#	#	;file_id=#;block_len=#
-master-bin.000002	#	Execute_load_query	#	#	use `test`; load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=#
+master-bin.000001	#	Query	#	#	use `test`; create table t2 (id int not null primary key auto_increment)
+master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
+master-bin.000001	#	Append_block	#	#	;file_id=#;block_len=#
+master-bin.000001	#	Append_block	#	#	;file_id=#;block_len=#
+master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=#
+==== Verify results on slave ====
+[on slave]
 select count(*) from t2 /* 5 000 */;
 count(*)
 5000
-drop table t1, t2;
-end of the tests
+==== Clean up ====
+[on master]
+drop table t2;
diff --git a/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result b/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
index caf39dd71a1..8f68936f6cc 100644
--- a/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
@@ -453,29 +453,29 @@ a	b	c
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
 CREATE TABLE t1 (i INT NOT NULL,
 c CHAR(16) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'MYISAM'  ;
 CREATE TABLE t2 (i INT NOT NULL,
 c CHAR(16) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'MYISAM'  ;
 ALTER TABLE t2 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
 CREATE TABLE t3 (i INT NOT NULL,
 c CHAR(128) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'MYISAM'  ;
 ALTER TABLE t3 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
 CREATE TABLE t4 (i INT NOT NULL,
 c CHAR(128) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'MYISAM'  ;
 CREATE TABLE t5 (i INT NOT NULL,
 c CHAR(255) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'MYISAM'  ;
 ALTER TABLE t5 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
 CREATE TABLE t6 (i INT NOT NULL,
 c CHAR(255) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'MYISAM'  ;
 ALTER TABLE t6 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
 CREATE TABLE t7 (i INT NOT NULL,
 c CHAR(255) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'MYISAM'  ;
 [expecting slave to replicate correctly]
 INSERT INTO t1 VALUES (1, "", 1);
 INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2);
@@ -489,7 +489,9 @@ INSERT INTO t3 VALUES (1, "", 1);
 INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
 Last_SQL_Error
 Table definition on master and slave does not match: Column 1 size mismatch - master has size 384, test.t3 on slave has size 49. Master's column size should be <= the slave's column size.
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
 START SLAVE;
 [expecting slave to replicate correctly]
 INSERT INTO t4 VALUES (1, "", 1);
@@ -500,14 +502,18 @@ INSERT INTO t5 VALUES (1, "", 1);
 INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2);
 Last_SQL_Error
 Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t5 on slave has size 49. Master's column size should be <= the slave's column size.
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
 START SLAVE;
 [expecting slave to stop]
 INSERT INTO t6 VALUES (1, "", 1);
 INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2);
 Last_SQL_Error
 Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t6 on slave has size 385. Master's column size should be <= the slave's column size.
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
 START SLAVE;
 [expecting slave to replicate correctly]
 INSERT INTO t7 VALUES (1, "", 1);
diff --git a/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
index 4de6cda9e9c..72517383cc3 100644
--- a/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
@@ -453,29 +453,29 @@ a	b	c
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
 CREATE TABLE t1 (i INT NOT NULL,
 c CHAR(16) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'INNODB'  ;
 CREATE TABLE t2 (i INT NOT NULL,
 c CHAR(16) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'INNODB'  ;
 ALTER TABLE t2 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
 CREATE TABLE t3 (i INT NOT NULL,
 c CHAR(128) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'INNODB'  ;
 ALTER TABLE t3 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
 CREATE TABLE t4 (i INT NOT NULL,
 c CHAR(128) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'INNODB'  ;
 CREATE TABLE t5 (i INT NOT NULL,
 c CHAR(255) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'INNODB'  ;
 ALTER TABLE t5 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
 CREATE TABLE t6 (i INT NOT NULL,
 c CHAR(255) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'INNODB'  ;
 ALTER TABLE t6 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
 CREATE TABLE t7 (i INT NOT NULL,
 c CHAR(255) CHARACTER SET utf8 NOT NULL,
-j INT NOT NULL);
+j INT NOT NULL) ENGINE = 'INNODB'  ;
 [expecting slave to replicate correctly]
 INSERT INTO t1 VALUES (1, "", 1);
 INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2);
@@ -489,7 +489,9 @@ INSERT INTO t3 VALUES (1, "", 1);
 INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
 Last_SQL_Error
 Table definition on master and slave does not match: Column 1 size mismatch - master has size 384, test.t3 on slave has size 49. Master's column size should be <= the slave's column size.
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
 START SLAVE;
 [expecting slave to replicate correctly]
 INSERT INTO t4 VALUES (1, "", 1);
@@ -500,14 +502,18 @@ INSERT INTO t5 VALUES (1, "", 1);
 INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2);
 Last_SQL_Error
 Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t5 on slave has size 49. Master's column size should be <= the slave's column size.
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
 START SLAVE;
 [expecting slave to stop]
 INSERT INTO t6 VALUES (1, "", 1);
 INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2);
 Last_SQL_Error
 Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t6 on slave has size 385. Master's column size should be <= the slave's column size.
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
 START SLAVE;
 [expecting slave to replicate correctly]
 INSERT INTO t7 VALUES (1, "", 1);
diff --git a/mysql-test/suite/rpl/r/rpl_stm_log.result b/mysql-test/suite/rpl/r/rpl_stm_log.result
index eefac3ca13d..17f607057bb 100644
--- a/mysql-test/suite/rpl/r/rpl_stm_log.result
+++ b/mysql-test/suite/rpl/r/rpl_stm_log.result
@@ -193,8 +193,8 @@ master-bin.000001	#	Intvar	#	#	INSERT_ID=1
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (NULL)
 master-bin.000001	#	Query	#	#	use `test`; drop table t1
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
-master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=581
-master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=#
+master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
+master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines ;file_id=#
 master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002';
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
diff --git a/mysql-test/suite/rpl/r/rpl_variables.result b/mysql-test/suite/rpl/r/rpl_variables.result
index bf6792f9f96..b3108c75a6e 100644
--- a/mysql-test/suite/rpl/r/rpl_variables.result
+++ b/mysql-test/suite/rpl/r/rpl_variables.result
@@ -45,7 +45,7 @@ RESET SLAVE;
 RESET MASTER;
 include/start_slave.inc
 [on slave]
-SET @@global.init_slave = 'ant';
+SET @@global.init_slave = 'SELECT 1';
 [on master]
 CREATE TABLE tstmt (id INT AUTO_INCREMENT PRIMARY KEY,
 truth BOOLEAN,
@@ -66,9 +66,9 @@ SET @@global.sync_binlog = 2000000;
 INSERT INTO tstmt(num) VALUES (@@global.sync_binlog);
 SET @@global.sync_binlog = 3000000;
 INSERT INTO tstmt(num) VALUES (@@global.sync_binlog);
-SET @@global.init_slave = 'bison';
+SET @@global.init_slave = 'SELECT 2';
 INSERT INTO tstmt(text) VALUES (@@global.init_slave);
-SET @@global.init_slave = 'cat';
+SET @@global.init_slave = 'SELECT 3';
 INSERT INTO tstmt(text) VALUES (@@global.init_slave);
 SET @@global.slave_exec_mode = 'IDEMPOTENT';
 INSERT INTO tstmt(text) VALUES (@@global.slave_exec_mode);
@@ -140,9 +140,9 @@ INSERT INTO tproc(num) VALUES (@@global.sync_binlog);
 SET @@global.sync_binlog = 3000000;
 INSERT INTO tproc(num) VALUES (@@global.sync_binlog);
 # string
-SET @@global.init_slave = 'bison';
+SET @@global.init_slave = 'SELECT 2';
 INSERT INTO tproc(text) VALUES (@@global.init_slave);
-SET @@global.init_slave = 'cat';
+SET @@global.init_slave = 'SELECT 3';
 INSERT INTO tproc(text) VALUES (@@global.init_slave);
 # enumeration
 SET @@global.slave_exec_mode = 'IDEMPOTENT';
@@ -226,9 +226,9 @@ INSERT INTO tfunc(num) VALUES (@@global.sync_binlog);
 SET @@global.sync_binlog = 3000000;
 INSERT INTO tfunc(num) VALUES (@@global.sync_binlog);
 # string
-SET @@global.init_slave = 'bison';
+SET @@global.init_slave = 'SELECT 2';
 INSERT INTO tfunc(text) VALUES (@@global.init_slave);
-SET @@global.init_slave = 'cat';
+SET @@global.init_slave = 'SELECT 3';
 INSERT INTO tfunc(text) VALUES (@@global.init_slave);
 # enumeration
 SET @@global.slave_exec_mode = 'IDEMPOTENT';
@@ -316,9 +316,9 @@ INSERT INTO ttrig(num) VALUES (@@global.sync_binlog);
 SET @@global.sync_binlog = 3000000;
 INSERT INTO ttrig(num) VALUES (@@global.sync_binlog);
 # string
-SET @@global.init_slave = 'bison';
+SET @@global.init_slave = 'SELECT 2';
 INSERT INTO ttrig(text) VALUES (@@global.init_slave);
-SET @@global.init_slave = 'cat';
+SET @@global.init_slave = 'SELECT 3';
 INSERT INTO ttrig(text) VALUES (@@global.init_slave);
 # enumeration
 SET @@global.slave_exec_mode = 'IDEMPOTENT';
@@ -395,9 +395,9 @@ PREPARE p5 FROM 'SET @@global.sync_binlog = 2000000';
 PREPARE p6 FROM 'INSERT INTO tprep(num) VALUES (@@global.sync_binlog)';
 PREPARE p7 FROM 'SET @@global.sync_binlog = 3000000';
 PREPARE p8 FROM 'INSERT INTO tprep(num) VALUES (@@global.sync_binlog)';
-PREPARE p9 FROM 'SET @@global.init_slave = \'bison\'';
+PREPARE p9 FROM 'SET @@global.init_slave = \'SELECT 2\'';
 PREPARE p10 FROM 'INSERT INTO tprep(text) VALUES (@@global.init_slave)';
-PREPARE p11 FROM 'SET @@global.init_slave = \'cat\'';
+PREPARE p11 FROM 'SET @@global.init_slave = \'SELECT 3\'';
 PREPARE p12 FROM 'INSERT INTO tprep(text) VALUES (@@global.init_slave)';
 PREPARE p13 FROM 'SET @@global.slave_exec_mode = \'IDEMPOTENT\'';
 PREPARE p14 FROM 'INSERT INTO tprep(text) VALUES (@@global.slave_exec_mode)';
@@ -522,8 +522,8 @@ id	truth	num	text
 2	0	NULL	NULL
 3	NULL	2000000	NULL
 4	NULL	3000000	NULL
-5	NULL	NULL	bison
-6	NULL	NULL	cat
+5	NULL	NULL	SELECT 2
+6	NULL	NULL	SELECT 3
 7	NULL	NULL	IDEMPOTENT
 8	NULL	NULL	STRICT
 9	1	NULL	NULL
diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def
index 43a379dbe03..a8c83d58884 100644
--- a/mysql-test/suite/rpl/t/disabled.def
+++ b/mysql-test/suite/rpl/t/disabled.def
@@ -13,3 +13,4 @@
 rpl_redirect               : Failure is sporadic and and the test is superfluous (mats)
 rpl_innodb_bug28430        : Failure on Solaris Bug #36793
 rpl_temporary              : BUG#38269 2008-07-21 Sven valgrind error in pushbuild
+rpl_flushlog_loop          : BUG#37733 2008-07-23 Sven disabled in 5.1-bugteam. the bug has been fixed in 5.1-rpl: please re-enable when that gets pushed to main
diff --git a/mysql-test/suite/rpl/t/rpl_incident.test b/mysql-test/suite/rpl/t/rpl_incident.test
index 3e2eb32a4ff..38fcc116736 100644
--- a/mysql-test/suite/rpl/t/rpl_incident.test
+++ b/mysql-test/suite/rpl/t/rpl_incident.test
@@ -19,6 +19,37 @@ source include/wait_for_slave_sql_to_stop.inc;
 # The 4 should not be inserted into the table, since the incident log
 # event should have stop the slave.
 --echo **** On Slave ****
+#### BEGIN DEBUG INFO ADDED BY SVEN 2008-07-18 -- SEE BUG#38077 ####
+let $tables= query_get_value(SHOW TABLES, Tables_in_test, 1);
+if (`SELECT '$tables' != 't1'`)
+{
+  --echo **** TEST CASE BUG! PRINTING DEBUG INFO! ****
+  --echo **** Dear developer, if you see this in the output of a test
+  --echo **** case run, please add all the information below as a
+  --echo **** comment to BUG#38077. If it's a pushbuild failure, please
+  --echo **** include a link to the push page.
+  --echo **** Thank you! /Sven
+  SHOW BINLOG EVENTS;
+  --echo **** master binlog ****
+  --error 0,1
+  --exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/master-bin.000001
+  --echo **** slave binlog ****
+  --error 0,1
+  --exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/slave-bin.000001
+  --echo **** slave status ****
+  query_vertical SHOW SLAVE STATUS;
+  --echo **** slave's master status ****
+  SHOW MASTER STATUS;
+  --echo **** slave binlog events ****
+  --echo [on master]
+  connection master;
+  --echo **** master status ****
+  SHOW MASTER STATUS;
+  --echo **** master binlog events ****
+  SHOW BINLOG EVENTS;
+  exit;
+}
+#### END DEBUG INFO ####
 SELECT * FROM t1;
 
 --replace_result $MASTER_MYPORT MASTER_PORT
diff --git a/mysql-test/suite/rpl/t/rpl_loaddata_map.test b/mysql-test/suite/rpl/t/rpl_loaddata_map.test
index 6a8378c8fdc..ddee9e7e989 100644
--- a/mysql-test/suite/rpl/t/rpl_loaddata_map.test
+++ b/mysql-test/suite/rpl/t/rpl_loaddata_map.test
@@ -1,7 +1,16 @@
+# ==== Purpose ====
 #
 #  check replication of load data with the server parameters subjected to
 #  read_buffer_size > max_allowed_packet
 #
+# ==== Implementation ====
+#
+# Insert many rows into t1, write t1 to file.
+# Load the file into t2.
+# See that t2 came out as expected on slave.
+#
+# ==== Related Bugs ====
+#
 #  BUG#30435 loading large LOAD DATA INFILE breaks slave with 
 #            read_buffer_size set on master
 #  BUG#33413 show binlog events fails if binlog has event size of close
@@ -9,10 +18,17 @@
 
 source include/have_binlog_format_mixed_or_statement.inc;
 source include/master-slave.inc;
-source include/have_innodb.inc;
-source include/have_binlog_format_mixed_or_statement.inc;
+
+
+--echo ==== Create a big file ====
+
+# We turn off binlogging to avoid too much noise in the binlog. t1 is
+# just an auxiliary construction anyways, it is not needed on the
+# slave.
 
 --disable_query_log
+SET @@sql_log_bin= 0;
+
 let $rows= 5000;
 create table t1 (id int not null primary key auto_increment);
 
@@ -22,10 +38,13 @@ while($rows)
   dec $rows;
 }
 eval select * into outfile '$MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' from t1;
-flush logs;
+
+DROP TABLE t1;
+SET @@sql_log_bin= 1;
 --enable_query_log
 
-connection master;
+
+--echo ==== Load our big file into a table ====
 create table t2 (id int not null primary key auto_increment);
 
 select @@session.read_buffer_size - @@session.max_allowed_packet > 0 ;
@@ -34,21 +53,21 @@ select @@session.read_buffer_size - @@session.max_allowed_packet > 0 ;
 eval load data infile '$MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2;
 select count(*) from t2 /* 5 000 */;
 
-# the binglog will show fragmented Append_block events
---let $binlog_start=106
---replace_column 2 # 4 # 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\// /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start <binlog_start>
---eval show binlog events in 'master-bin.000002' from $binlog_start
+# the binlog will show fragmented Append_block events
+source include/show_binlog_events.inc;
+
 
+--echo ==== Verify results on slave ====
 
+--echo [on slave]
 sync_slave_with_master;
-#connection slave;
 select count(*) from t2 /* 5 000 */;
 
+
+--echo ==== Clean up ====
+
+--echo [on master]
 connection master;
-drop table t1, t2;
+drop table t2;
 sync_slave_with_master;
 remove_file $MYSQLTEST_VARDIR/tmp/bug30435_5k.txt;
-
---echo end of the tests
diff --git a/mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt b/mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt
deleted file mode 100644
index 83ed8522e72..00000000000
--- a/mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---binlog-format=row
diff --git a/mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt b/mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
deleted file mode 100644
index 4cb7a31da81..00000000000
--- a/mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
+++ /dev/null
@@ -1 +0,0 @@
---binlog-format=statement --log-slave-updates
diff --git a/mysql-test/suite/rpl/t/rpl_trunc_temp.test b/mysql-test/suite/rpl/t/rpl_trunc_temp.test
index 93308e3eb3f..88ecb7c18b0 100644
--- a/mysql-test/suite/rpl/t/rpl_trunc_temp.test
+++ b/mysql-test/suite/rpl/t/rpl_trunc_temp.test
@@ -1,13 +1,30 @@
-# Requires statement logging
+# ==== Purpose ====
+#
+# Verify that Slave_open_temp_tables is increased when a temporary
+# table is opened on the slave, and decreased when a temporary table
+# is closed on the slave, and that it is preserved during 'DELETE FROM
+# table' and 'TRUNCATE table'.
+#
+# ==== Method ====
+#
+# Create a temporary table on master, insert rows, and try:
+#  - delete rows from the table
+#  - truncate the table
+#  - drop the table
+#
+# ==== Related bugs ====
+#
+# BUG#17137 Running "truncate table" on temporary table leaves the table open on a slave
+#
+# Bug in this test: BUG#37493: rpl_trunc_temp.test nondeterministic
+
+
+# Requires statement-based logging since temporary tables are not
+# logged in row-based logging
 -- source include/have_binlog_format_mixed_or_statement.inc
 
 source include/master-slave.inc;
 
-#
-# Bug#17137 Running "truncate table" on temporary table
-# leaves the table open on a slave
-#
-
 create temporary table t1 (n int);
 insert into t1 values(1);
 sync_slave_with_master;
@@ -28,13 +45,10 @@ show status like 'Slave_open_temp_tables';
 # Disconnect the master, temp table on slave should dissapear
 disconnect master;
 
-connection master1;
-# Wait until drop of temp tables appers in binlog
+connection slave;
+
+# Wait until drop of temp tables appers in slave's binlog
 let $wait_binlog_event= DROP;
 source include/wait_for_binlog_event.inc;
 
-connection slave;
 show status like 'Slave_open_temp_tables';
-
-
-# End of 4.1 tests
diff --git a/mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt b/mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt
deleted file mode 100644
index 01cf3e0520f..00000000000
--- a/mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---binlog-format=mixed
diff --git a/mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test b/mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test
index 4ee6c98d463..5381dff95a3 100644
--- a/mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test
+++ b/mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test
@@ -1,6 +1,6 @@
 # Same test as rpl_truncate_7ndb.test, but with mixed mode
 # This is marked with 'big_test' just because the rpl_truncate_7ndb test is
 # so slow...
-
+--source include/have_binlog_format_mixed.inc
 --source include/big_test.inc
 --source t/rpl_truncate_7ndb.test
diff --git a/mysql-test/suite/rpl/t/rpl_variables.test b/mysql-test/suite/rpl/t/rpl_variables.test
index 3669e14c5df..6c3b3ab6d8a 100644
--- a/mysql-test/suite/rpl/t/rpl_variables.test
+++ b/mysql-test/suite/rpl/t/rpl_variables.test
@@ -117,7 +117,7 @@ source include/reset_master_and_slave.inc;
 # above, but can't because it affects how the slave works.
 --echo [on slave]
 connection slave;
-SET @@global.init_slave = 'ant';
+SET @@global.init_slave = 'SELECT 1';
 
 
 --echo [on master]
@@ -154,9 +154,9 @@ SET @@global.sync_binlog = 3000000;
 INSERT INTO tstmt(num) VALUES (@@global.sync_binlog);
 
 # string
-SET @@global.init_slave = 'bison';
+SET @@global.init_slave = 'SELECT 2';
 INSERT INTO tstmt(text) VALUES (@@global.init_slave);
-SET @@global.init_slave = 'cat';
+SET @@global.init_slave = 'SELECT 3';
 INSERT INTO tstmt(text) VALUES (@@global.init_slave);
 
 # enumeration
@@ -258,9 +258,9 @@ BEGIN
   INSERT INTO tproc(num) VALUES (@@global.sync_binlog);
 
   # string
-  SET @@global.init_slave = 'bison';
+  SET @@global.init_slave = 'SELECT 2';
   INSERT INTO tproc(text) VALUES (@@global.init_slave);
-  SET @@global.init_slave = 'cat';
+  SET @@global.init_slave = 'SELECT 3';
   INSERT INTO tproc(text) VALUES (@@global.init_slave);
 
   # enumeration
@@ -367,9 +367,9 @@ BEGIN
   INSERT INTO tfunc(num) VALUES (@@global.sync_binlog);
 
   # string
-  SET @@global.init_slave = 'bison';
+  SET @@global.init_slave = 'SELECT 2';
   INSERT INTO tfunc(text) VALUES (@@global.init_slave);
-  SET @@global.init_slave = 'cat';
+  SET @@global.init_slave = 'SELECT 3';
   INSERT INTO tfunc(text) VALUES (@@global.init_slave);
 
   # enumeration
@@ -478,9 +478,9 @@ BEGIN
   INSERT INTO ttrig(num) VALUES (@@global.sync_binlog);
 
   # string
-  SET @@global.init_slave = 'bison';
+  SET @@global.init_slave = 'SELECT 2';
   INSERT INTO ttrig(text) VALUES (@@global.init_slave);
-  SET @@global.init_slave = 'cat';
+  SET @@global.init_slave = 'SELECT 3';
   INSERT INTO ttrig(text) VALUES (@@global.init_slave);
 
   # enumeration
@@ -581,9 +581,9 @@ PREPARE p7 FROM 'SET @@global.sync_binlog = 3000000';
 PREPARE p8 FROM 'INSERT INTO tprep(num) VALUES (@@global.sync_binlog)';
 
 # string
-PREPARE p9 FROM 'SET @@global.init_slave = \'bison\'';
+PREPARE p9 FROM 'SET @@global.init_slave = \'SELECT 2\'';
 PREPARE p10 FROM 'INSERT INTO tprep(text) VALUES (@@global.init_slave)';
-PREPARE p11 FROM 'SET @@global.init_slave = \'cat\'';
+PREPARE p11 FROM 'SET @@global.init_slave = \'SELECT 3\'';
 PREPARE p12 FROM 'INSERT INTO tprep(text) VALUES (@@global.init_slave)';
 
 # enumeration
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result b/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
index 3a8b008951e..9ba0869a4d2 100644
--- a/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
+++ b/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
@@ -437,7 +437,7 @@ SELECT COUNT(*) FROM t1 ORDER BY c1,c2;
 COUNT(*)	0
 set @@global.slave_exec_mode= default;
 Last_SQL_Error
-0
+
 SELECT COUNT(*) FROM t1 ORDER BY c1,c2;
 COUNT(*)	0
 **** Test for BUG#37076 ****
@@ -451,3 +451,72 @@ SELECT * FROM t1;
 a	b	c
 2005-11-14 01:01:01	2005-11-14 01:01:02	2005-11-14
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
+CREATE TABLE t1 (i INT NOT NULL,
+c CHAR(16) CHARACTER SET utf8 NOT NULL,
+j INT NOT NULL) ENGINE = 'NDB'  ;
+CREATE TABLE t2 (i INT NOT NULL,
+c CHAR(16) CHARACTER SET utf8 NOT NULL,
+j INT NOT NULL) ENGINE = 'NDB'  ;
+ALTER TABLE t2 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
+CREATE TABLE t3 (i INT NOT NULL,
+c CHAR(128) CHARACTER SET utf8 NOT NULL,
+j INT NOT NULL) ENGINE = 'NDB'  ;
+ALTER TABLE t3 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
+CREATE TABLE t4 (i INT NOT NULL,
+c CHAR(128) CHARACTER SET utf8 NOT NULL,
+j INT NOT NULL) ENGINE = 'NDB'  ;
+CREATE TABLE t5 (i INT NOT NULL,
+c CHAR(255) CHARACTER SET utf8 NOT NULL,
+j INT NOT NULL) ENGINE = 'NDB'  ;
+ALTER TABLE t5 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
+CREATE TABLE t6 (i INT NOT NULL,
+c CHAR(255) CHARACTER SET utf8 NOT NULL,
+j INT NOT NULL) ENGINE = 'NDB'  ;
+ALTER TABLE t6 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
+CREATE TABLE t7 (i INT NOT NULL,
+c CHAR(255) CHARACTER SET utf8 NOT NULL,
+j INT NOT NULL) ENGINE = 'NDB'  ;
+[expecting slave to replicate correctly]
+INSERT INTO t1 VALUES (1, "", 1);
+INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2);
+Comparing tables master:test.t1 and slave:test.t1
+[expecting slave to replicate correctly]
+INSERT INTO t2 VALUES (1, "", 1);
+INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2);
+Comparing tables master:test.t2 and slave:test.t2
+[expecting slave to stop]
+INSERT INTO t3 VALUES (1, "", 1);
+INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
+Last_SQL_Error
+Table definition on master and slave does not match: Column 1 size mismatch - master has size 384, test.t3 on slave has size 49. Master's column size should be <= the slave's column size.
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
+START SLAVE;
+[expecting slave to replicate correctly]
+INSERT INTO t4 VALUES (1, "", 1);
+INSERT INTO t4 VALUES (2, repeat(_utf8'a', 128), 2);
+Comparing tables master:test.t4 and slave:test.t4
+[expecting slave to stop]
+INSERT INTO t5 VALUES (1, "", 1);
+INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2);
+Last_SQL_Error
+Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t5 on slave has size 49. Master's column size should be <= the slave's column size.
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
+START SLAVE;
+[expecting slave to stop]
+INSERT INTO t6 VALUES (1, "", 1);
+INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2);
+Last_SQL_Error
+Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t6 on slave has size 385. Master's column size should be <= the slave's column size.
+RESET MASTER;
+STOP SLAVE;
+RESET SLAVE;
+START SLAVE;
+[expecting slave to replicate correctly]
+INSERT INTO t7 VALUES (1, "", 1);
+INSERT INTO t7 VALUES (2, repeat(_utf8'a', 255), 2);
+Comparing tables master:test.t7 and slave:test.t7
+drop table t1, t2, t3, t4, t5, t6, t7;
diff --git a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def
index 69bff7ff9b5..ebc99feeac6 100644
--- a/mysql-test/suite/rpl_ndb/t/disabled.def
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def
@@ -12,5 +12,5 @@
 
 rpl_ndb_circular         : Bug#33849 COMMIT event missing in cluster circular replication.
 rpl_ndb_circular_simplex : Bug#33849 COMMIT event missing in cluster circular replication.
-rpl_row_basic_7ndb       : Bug#38369 rpl_ndb.rpl_row_basic_7ndb fails
-rpl_ndb_circular_2ch	 : Bug#33849 COMMIT event missing in cluster circular replication.
+
+# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
diff --git a/mysql-test/suite/sys_vars/README b/mysql-test/suite/sys_vars/README
new file mode 100644
index 00000000000..a84f00f1f62
--- /dev/null
+++ b/mysql-test/suite/sys_vars/README
@@ -0,0 +1,3 @@
+Some of these tests allocate more than 4GB RAM.
+So, assure that the machine on which the suite will be executed has more than 4GB RAM.
+
diff --git a/mysql-test/include/binlog_cache_size_basic.inc b/mysql-test/suite/sys_vars/inc/binlog_cache_size_basic.inc
index 323e19c4d66..323e19c4d66 100644
--- a/mysql-test/include/binlog_cache_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/binlog_cache_size_basic.inc
diff --git a/mysql-test/include/bulk_insert_buffer_size_basic.inc b/mysql-test/suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc
index 56ffbace173..56ffbace173 100644
--- a/mysql-test/include/bulk_insert_buffer_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc
diff --git a/mysql-test/include/delayed_insert_limit_basic.inc b/mysql-test/suite/sys_vars/inc/delayed_insert_limit_basic.inc
index ab158bc593e..ab158bc593e 100644
--- a/mysql-test/include/delayed_insert_limit_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/delayed_insert_limit_basic.inc
diff --git a/mysql-test/include/delayed_queue_size_basic.inc b/mysql-test/suite/sys_vars/inc/delayed_queue_size_basic.inc
index 2d16f75d4e1..2d16f75d4e1 100644
--- a/mysql-test/include/delayed_queue_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/delayed_queue_size_basic.inc
diff --git a/mysql-test/include/innodb_concurrency_tickets_basic.inc b/mysql-test/suite/sys_vars/inc/innodb_concurrency_tickets_basic.inc
index 67b0247d169..67b0247d169 100644
--- a/mysql-test/include/innodb_concurrency_tickets_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/innodb_concurrency_tickets_basic.inc
diff --git a/mysql-test/include/innodb_max_purge_lag_basic.inc b/mysql-test/suite/sys_vars/inc/innodb_max_purge_lag_basic.inc
index 9e6b8201e3d..9e6b8201e3d 100644
--- a/mysql-test/include/innodb_max_purge_lag_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/innodb_max_purge_lag_basic.inc
diff --git a/mysql-test/include/innodb_sync_spin_loops_basic.inc b/mysql-test/suite/sys_vars/inc/innodb_sync_spin_loops_basic.inc
index 35460fe47f2..35460fe47f2 100644
--- a/mysql-test/include/innodb_sync_spin_loops_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/innodb_sync_spin_loops_basic.inc
diff --git a/mysql-test/include/join_buffer_size_basic.inc b/mysql-test/suite/sys_vars/inc/join_buffer_size_basic.inc
index 880dac4cac4..880dac4cac4 100644
--- a/mysql-test/include/join_buffer_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/join_buffer_size_basic.inc
diff --git a/mysql-test/include/key_buffer_size_basic.inc b/mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc
index 996a9e712f9..996a9e712f9 100644
--- a/mysql-test/include/key_buffer_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc
diff --git a/mysql-test/include/key_cache_age_threshold_basic.inc b/mysql-test/suite/sys_vars/inc/key_cache_age_threshold_basic.inc
index 7841ad2cedc..7841ad2cedc 100644
--- a/mysql-test/include/key_cache_age_threshold_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/key_cache_age_threshold_basic.inc
diff --git a/mysql-test/include/key_cache_block_size_basic.inc b/mysql-test/suite/sys_vars/inc/key_cache_block_size_basic.inc
index b12ea45b762..b12ea45b762 100644
--- a/mysql-test/include/key_cache_block_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/key_cache_block_size_basic.inc
diff --git a/mysql-test/include/key_cache_division_limit_basic.inc b/mysql-test/suite/sys_vars/inc/key_cache_division_limit_basic.inc
index a2cc49a1f38..a2cc49a1f38 100644
--- a/mysql-test/include/key_cache_division_limit_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/key_cache_division_limit_basic.inc
diff --git a/mysql-test/include/log_warnings_basic.inc b/mysql-test/suite/sys_vars/inc/log_warnings_basic.inc
index cd7e1023649..cd7e1023649 100644
--- a/mysql-test/include/log_warnings_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/log_warnings_basic.inc
diff --git a/mysql-test/include/max_binlog_cache_size_basic.inc b/mysql-test/suite/sys_vars/inc/max_binlog_cache_size_basic.inc
index 9f3416d2e31..9f3416d2e31 100644
--- a/mysql-test/include/max_binlog_cache_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/max_binlog_cache_size_basic.inc
diff --git a/mysql-test/include/max_connect_errors_basic.inc b/mysql-test/suite/sys_vars/inc/max_connect_errors_basic.inc
index 530022652a1..530022652a1 100644
--- a/mysql-test/include/max_connect_errors_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/max_connect_errors_basic.inc
diff --git a/mysql-test/include/max_heap_table_size_basic.inc b/mysql-test/suite/sys_vars/inc/max_heap_table_size_basic.inc
index d07ae094cde..d07ae094cde 100644
--- a/mysql-test/include/max_heap_table_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/max_heap_table_size_basic.inc
diff --git a/mysql-test/include/max_seeks_for_key_basic.inc b/mysql-test/suite/sys_vars/inc/max_seeks_for_key_basic.inc
index 23c3c5b2a95..23c3c5b2a95 100644
--- a/mysql-test/include/max_seeks_for_key_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/max_seeks_for_key_basic.inc
diff --git a/mysql-test/include/max_tmp_tables_basic.inc b/mysql-test/suite/sys_vars/inc/max_tmp_tables_basic.inc
index e24d97f47dd..e24d97f47dd 100644
--- a/mysql-test/include/max_tmp_tables_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/max_tmp_tables_basic.inc
diff --git a/mysql-test/include/max_write_lock_count_basic.inc b/mysql-test/suite/sys_vars/inc/max_write_lock_count_basic.inc
index 80d5b7cc747..80d5b7cc747 100644
--- a/mysql-test/include/max_write_lock_count_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/max_write_lock_count_basic.inc
diff --git a/mysql-test/include/min_examined_row_limit_basic.inc b/mysql-test/suite/sys_vars/inc/min_examined_row_limit_basic.inc
index c032d4a9d6d..c032d4a9d6d 100644
--- a/mysql-test/include/min_examined_row_limit_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/min_examined_row_limit_basic.inc
diff --git a/mysql-test/include/multi_range_count_basic.inc b/mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc
index 47e8352196f..47e8352196f 100644
--- a/mysql-test/include/multi_range_count_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc
diff --git a/mysql-test/include/myisam_max_sort_file_size_basic.inc b/mysql-test/suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc
index 23f0607b439..23f0607b439 100644
--- a/mysql-test/include/myisam_max_sort_file_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc
diff --git a/mysql-test/include/myisam_repair_threads_basic.inc b/mysql-test/suite/sys_vars/inc/myisam_repair_threads_basic.inc
index 8485e79ff03..8485e79ff03 100644
--- a/mysql-test/include/myisam_repair_threads_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/myisam_repair_threads_basic.inc
diff --git a/mysql-test/include/myisam_sort_buffer_size_basic.inc b/mysql-test/suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc
index 8e36d8a2c70..8e36d8a2c70 100644
--- a/mysql-test/include/myisam_sort_buffer_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc
diff --git a/mysql-test/include/net_retry_count_basic.inc b/mysql-test/suite/sys_vars/inc/net_retry_count_basic.inc
index 537d8eea6c6..537d8eea6c6 100644
--- a/mysql-test/include/net_retry_count_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/net_retry_count_basic.inc
diff --git a/mysql-test/include/query_alloc_block_size_basic.inc b/mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc
index 208fe6b3da4..208fe6b3da4 100644
--- a/mysql-test/include/query_alloc_block_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc
diff --git a/mysql-test/include/query_cache_limit_basic.inc b/mysql-test/suite/sys_vars/inc/query_cache_limit_basic.inc
index 2eb4a597eef..2eb4a597eef 100644
--- a/mysql-test/include/query_cache_limit_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/query_cache_limit_basic.inc
diff --git a/mysql-test/include/query_cache_min_res_unit_basic.inc b/mysql-test/suite/sys_vars/inc/query_cache_min_res_unit_basic.inc
index 1b65e035b18..1b65e035b18 100644
--- a/mysql-test/include/query_cache_min_res_unit_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/query_cache_min_res_unit_basic.inc
diff --git a/mysql-test/include/query_cache_size_basic.inc b/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc
index 1a3f9e1efe2..1a3f9e1efe2 100644
--- a/mysql-test/include/query_cache_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc
diff --git a/mysql-test/include/query_prealloc_size_basic.inc b/mysql-test/suite/sys_vars/inc/query_prealloc_size_basic.inc
index ac005b696fa..3a8608736c5 100644
--- a/mysql-test/include/query_prealloc_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/query_prealloc_size_basic.inc
@@ -21,9 +21,6 @@
 # Reference:                                                                   #
 #      http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html     #
 #                                                                              #
-# Last Modification:                                                           #
-# 2008-07-14 hhunger removed values for 64 bit platforms.                      #
-#                                                                              #
 ################################################################################
 
 --source include/load_sysvars.inc
@@ -77,9 +74,8 @@ SELECT @@session.query_prealloc_size   = 8192;
 SET @@global.query_prealloc_size   = 8192;
 SELECT @@global.query_prealloc_size  ;
 
-# Due to problems with 64 bit machines having less than 6 GB main memory.
-#SET @@global.query_prealloc_size   = 4294967295;
-#SELECT @@global.query_prealloc_size  ;
+SET @@global.query_prealloc_size   = 4294967295;
+SELECT @@global.query_prealloc_size  ;
 
 SET @@global.query_prealloc_size   = 655354;
 SELECT @@global.query_prealloc_size  ;
@@ -93,9 +89,8 @@ SELECT @@global.query_prealloc_size  ;
 SET @@session.query_prealloc_size   = 8192;
 SELECT @@session.query_prealloc_size  ;
 
-# Due to problems with 64 bit machines having less than 6 GB main memory.
-#SET @@session.query_prealloc_size   = 4294967295;
-#SELECT @@session.query_prealloc_size  ;
+SET @@session.query_prealloc_size   = 4294967295;
+SELECT @@session.query_prealloc_size  ;
 
 SET @@session.query_prealloc_size   = 655345;
 SELECT @@session.query_prealloc_size  ;
@@ -114,9 +109,8 @@ SELECT @@global.query_prealloc_size  ;
 SET @@global.query_prealloc_size   = -1024;
 SELECT @@global.query_prealloc_size  ;
 
-# Due to problems with 64 bit machines having less than 6 GB main memory.
-#SET @@global.query_prealloc_size   = 429496729533;
-#SELECT @@global.query_prealloc_size  ;
+SET @@global.query_prealloc_size   = 429496729533;
+SELECT @@global.query_prealloc_size  ;
 
 
 --Error ER_PARSE_ERROR
diff --git a/mysql-test/include/range_alloc_block_size_basic.inc b/mysql-test/suite/sys_vars/inc/range_alloc_block_size_basic.inc
index 37692cc8c35..37692cc8c35 100644
--- a/mysql-test/include/range_alloc_block_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/range_alloc_block_size_basic.inc
diff --git a/mysql-test/include/rpl_recovery_rank_basic.inc b/mysql-test/suite/sys_vars/inc/rpl_recovery_rank_basic.inc
index f9ae3968b31..f9ae3968b31 100644
--- a/mysql-test/include/rpl_recovery_rank_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/rpl_recovery_rank_basic.inc
diff --git a/mysql-test/include/server_id_basic.inc b/mysql-test/suite/sys_vars/inc/server_id_basic.inc
index 47afadb5016..47afadb5016 100644
--- a/mysql-test/include/server_id_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/server_id_basic.inc
diff --git a/mysql-test/include/slave_transaction_retries_basic.inc b/mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc
index 6bbed3b1982..6bbed3b1982 100644
--- a/mysql-test/include/slave_transaction_retries_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc
diff --git a/mysql-test/include/sort_buffer_size_basic.inc b/mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc
index 4dbae7c8847..4dbae7c8847 100644
--- a/mysql-test/include/sort_buffer_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc
diff --git a/mysql-test/include/sync_binlog_basic.inc b/mysql-test/suite/sys_vars/inc/sync_binlog_basic.inc
index b66509bbb5e..b66509bbb5e 100644
--- a/mysql-test/include/sync_binlog_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/sync_binlog_basic.inc
diff --git a/mysql-test/include/timestamp_basic.inc b/mysql-test/suite/sys_vars/inc/timestamp_basic.inc
index d7ad620ec26..d7ad620ec26 100644
--- a/mysql-test/include/timestamp_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/timestamp_basic.inc
diff --git a/mysql-test/include/tmp_table_size_basic.inc b/mysql-test/suite/sys_vars/inc/tmp_table_size_basic.inc
index 7f69bcd1f8c..7f69bcd1f8c 100644
--- a/mysql-test/include/tmp_table_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/tmp_table_size_basic.inc
diff --git a/mysql-test/include/transaction_alloc_block_size_basic.inc b/mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
index c14383b86c6..c14383b86c6 100644
--- a/mysql-test/include/transaction_alloc_block_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
diff --git a/mysql-test/include/transaction_prealloc_size_basic.inc b/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc
index 1ca302a19e0..1ca302a19e0 100644
--- a/mysql-test/include/transaction_prealloc_size_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc
diff --git a/mysql-test/include/wait_timeout_basic.inc b/mysql-test/suite/sys_vars/inc/wait_timeout_basic.inc
index b6e19e235ba..b6e19e235ba 100644
--- a/mysql-test/include/wait_timeout_basic.inc
+++ b/mysql-test/suite/sys_vars/inc/wait_timeout_basic.inc
diff --git a/mysql-test/r/binlog_cache_size_basic_32.result b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_32.result
index 6267c5493da..6267c5493da 100644
--- a/mysql-test/r/binlog_cache_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_32.result
diff --git a/mysql-test/r/binlog_cache_size_basic_64.result b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result
index 45ed43589a3..45ed43589a3 100644
--- a/mysql-test/r/binlog_cache_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result
diff --git a/mysql-test/r/bulk_insert_buffer_size_basic_32.result b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result
index 1194a0e7ce7..1194a0e7ce7 100644
--- a/mysql-test/r/bulk_insert_buffer_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result
diff --git a/mysql-test/r/bulk_insert_buffer_size_basic_64.result b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result
index 9e0e8e07470..9e0e8e07470 100644
--- a/mysql-test/r/bulk_insert_buffer_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result
diff --git a/mysql-test/r/delayed_insert_limit_basic_32.result b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result
index cb6820b2941..cb6820b2941 100644
--- a/mysql-test/r/delayed_insert_limit_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result
diff --git a/mysql-test/r/delayed_insert_limit_basic_64.result b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result
index 246bf0e8734..246bf0e8734 100644
--- a/mysql-test/r/delayed_insert_limit_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result
diff --git a/mysql-test/r/delayed_queue_size_basic_32.result b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result
index 6bfa6f0de40..6bfa6f0de40 100644
--- a/mysql-test/r/delayed_queue_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result
diff --git a/mysql-test/r/delayed_queue_size_basic_64.result b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result
index d575626b0a1..d575626b0a1 100644
--- a/mysql-test/r/delayed_queue_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result
diff --git a/mysql-test/r/innodb_concurrency_tickets_basic_32.result b/mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic_32.result
index 1d1317d0d5e..1d1317d0d5e 100644
--- a/mysql-test/r/innodb_concurrency_tickets_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic_32.result
diff --git a/mysql-test/r/innodb_concurrency_tickets_basic_64.result b/mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic_64.result
index 40d307d8733..40d307d8733 100644
--- a/mysql-test/r/innodb_concurrency_tickets_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic_64.result
diff --git a/mysql-test/r/innodb_max_purge_lag_basic_32.result b/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic_32.result
index ed960f12ff1..ed960f12ff1 100644
--- a/mysql-test/r/innodb_max_purge_lag_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic_32.result
diff --git a/mysql-test/r/innodb_max_purge_lag_basic_64.result b/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic_64.result
index a6b669dde83..a6b669dde83 100644
--- a/mysql-test/r/innodb_max_purge_lag_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic_64.result
diff --git a/mysql-test/r/innodb_sync_spin_loops_basic_32.result b/mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic_32.result
index 2b976e65b14..2b976e65b14 100644
--- a/mysql-test/r/innodb_sync_spin_loops_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic_32.result
diff --git a/mysql-test/r/innodb_sync_spin_loops_basic_64.result b/mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic_64.result
index 1b99ad8e3db..1b99ad8e3db 100644
--- a/mysql-test/r/innodb_sync_spin_loops_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic_64.result
diff --git a/mysql-test/r/join_buffer_size_basic_32.result b/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result
index fc3061d2f59..fc3061d2f59 100644
--- a/mysql-test/r/join_buffer_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result
diff --git a/mysql-test/r/join_buffer_size_basic_64.result b/mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result
index ed652af67d2..ed652af67d2 100644
--- a/mysql-test/r/join_buffer_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result
diff --git a/mysql-test/r/key_buffer_size_basic_32.result b/mysql-test/suite/sys_vars/r/key_buffer_size_basic_32.result
index 981988a1d4d..981988a1d4d 100644
--- a/mysql-test/r/key_buffer_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/key_buffer_size_basic_32.result
diff --git a/mysql-test/r/key_buffer_size_basic_64.result b/mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result
index 981988a1d4d..981988a1d4d 100644
--- a/mysql-test/r/key_buffer_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result
diff --git a/mysql-test/r/key_cache_age_threshold_basic_32.result b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_32.result
index 023b23ea425..023b23ea425 100644
--- a/mysql-test/r/key_cache_age_threshold_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_32.result
diff --git a/mysql-test/r/key_cache_age_threshold_basic_64.result b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result
index 5e05dd7bacf..5e05dd7bacf 100644
--- a/mysql-test/r/key_cache_age_threshold_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result
diff --git a/mysql-test/r/key_cache_block_size_basic_32.result b/mysql-test/suite/sys_vars/r/key_cache_block_size_basic_32.result
index ac78acb8244..ac78acb8244 100644
--- a/mysql-test/r/key_cache_block_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/key_cache_block_size_basic_32.result
diff --git a/mysql-test/r/key_cache_block_size_basic_64.result b/mysql-test/suite/sys_vars/r/key_cache_block_size_basic_64.result
index 46ce1f26b29..46ce1f26b29 100644
--- a/mysql-test/r/key_cache_block_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/key_cache_block_size_basic_64.result
diff --git a/mysql-test/r/key_cache_division_limit_basic_32.result b/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic_32.result
index 5902dbcdf89..5902dbcdf89 100644
--- a/mysql-test/r/key_cache_division_limit_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic_32.result
diff --git a/mysql-test/r/key_cache_division_limit_basic_64.result b/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic_64.result
index cd0cdcbca05..cd0cdcbca05 100644
--- a/mysql-test/r/key_cache_division_limit_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic_64.result
diff --git a/mysql-test/r/log_warnings_basic_32.result b/mysql-test/suite/sys_vars/r/log_warnings_basic_32.result
index 702e95b1383..702e95b1383 100644
--- a/mysql-test/r/log_warnings_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/log_warnings_basic_32.result
diff --git a/mysql-test/r/log_warnings_basic_64.result b/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result
index ba6671c87a4..ba6671c87a4 100644
--- a/mysql-test/r/log_warnings_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result
diff --git a/mysql-test/r/max_binlog_cache_size_basic_32.result b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result
index 1dbeb50ff90..1dbeb50ff90 100644
--- a/mysql-test/r/max_binlog_cache_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result
diff --git a/mysql-test/r/max_binlog_cache_size_basic_64.result b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result
index 30db3f14dd4..30db3f14dd4 100644
--- a/mysql-test/r/max_binlog_cache_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result
diff --git a/mysql-test/r/max_connect_errors_basic_32.result b/mysql-test/suite/sys_vars/r/max_connect_errors_basic_32.result
index b786e0ce31a..b786e0ce31a 100644
--- a/mysql-test/r/max_connect_errors_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/max_connect_errors_basic_32.result
diff --git a/mysql-test/r/max_connect_errors_basic_64.result b/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result
index 8117b650651..8117b650651 100644
--- a/mysql-test/r/max_connect_errors_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result
diff --git a/mysql-test/r/max_heap_table_size_basic_32.result b/mysql-test/suite/sys_vars/r/max_heap_table_size_basic_32.result
index 04eaa3ddd19..04eaa3ddd19 100644
--- a/mysql-test/r/max_heap_table_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/max_heap_table_size_basic_32.result
diff --git a/mysql-test/r/max_heap_table_size_basic_64.result b/mysql-test/suite/sys_vars/r/max_heap_table_size_basic_64.result
index ebab80f376b..ebab80f376b 100644
--- a/mysql-test/r/max_heap_table_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/max_heap_table_size_basic_64.result
diff --git a/mysql-test/r/max_seeks_for_key_basic_32.result b/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_32.result
index 64828fbe619..64828fbe619 100644
--- a/mysql-test/r/max_seeks_for_key_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_32.result
diff --git a/mysql-test/r/max_seeks_for_key_basic_64.result b/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result
index eefb829cdae..eefb829cdae 100644
--- a/mysql-test/r/max_seeks_for_key_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result
diff --git a/mysql-test/r/max_tmp_tables_basic_32.result b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_32.result
index 5f959069661..5f959069661 100644
--- a/mysql-test/r/max_tmp_tables_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_32.result
diff --git a/mysql-test/r/max_tmp_tables_basic_64.result b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result
index 4b9f68c509e..4b9f68c509e 100644
--- a/mysql-test/r/max_tmp_tables_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result
diff --git a/mysql-test/r/max_write_lock_count_basic_32.result b/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_32.result
index 0c9c3c00c1f..0c9c3c00c1f 100644
--- a/mysql-test/r/max_write_lock_count_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_32.result
diff --git a/mysql-test/r/max_write_lock_count_basic_64.result b/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result
index d74586841dd..d74586841dd 100644
--- a/mysql-test/r/max_write_lock_count_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result
diff --git a/mysql-test/r/min_examined_row_limit_basic_32.result b/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_32.result
index c0315944a8a..c0315944a8a 100644
--- a/mysql-test/r/min_examined_row_limit_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_32.result
diff --git a/mysql-test/r/min_examined_row_limit_basic_64.result b/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result
index fa11659c6c5..fa11659c6c5 100644
--- a/mysql-test/r/min_examined_row_limit_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result
diff --git a/mysql-test/r/multi_range_count_basic_32.result b/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result
index f6ac6490479..f6ac6490479 100644
--- a/mysql-test/r/multi_range_count_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result
diff --git a/mysql-test/r/multi_range_count_basic_64.result b/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result
index f2115aec2e2..f2115aec2e2 100644
--- a/mysql-test/r/multi_range_count_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result
diff --git a/mysql-test/r/myisam_max_sort_file_size_basic_32.result b/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result
index 64d1168685c..64d1168685c 100644
--- a/mysql-test/r/myisam_max_sort_file_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result
diff --git a/mysql-test/r/myisam_max_sort_file_size_basic_64.result b/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result
index 00ff1dfc1ab..00ff1dfc1ab 100644
--- a/mysql-test/r/myisam_max_sort_file_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result
diff --git a/mysql-test/r/myisam_repair_threads_basic_32.result b/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_32.result
index c91128e3f4c..c91128e3f4c 100644
--- a/mysql-test/r/myisam_repair_threads_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_32.result
diff --git a/mysql-test/r/myisam_repair_threads_basic_64.result b/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result
index 8271451cc9e..8271451cc9e 100644
--- a/mysql-test/r/myisam_repair_threads_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result
diff --git a/mysql-test/r/myisam_sort_buffer_size_basic_32.result b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result
index 74d2fb3ec86..74d2fb3ec86 100644
--- a/mysql-test/r/myisam_sort_buffer_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result
diff --git a/mysql-test/r/myisam_sort_buffer_size_basic_64.result b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result
index bfcada76a46..bfcada76a46 100644
--- a/mysql-test/r/myisam_sort_buffer_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result
diff --git a/mysql-test/r/net_retry_count_basic_32.result b/mysql-test/suite/sys_vars/r/net_retry_count_basic_32.result
index 3923df539e7..3923df539e7 100644
--- a/mysql-test/r/net_retry_count_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/net_retry_count_basic_32.result
diff --git a/mysql-test/r/net_retry_count_basic_64.result b/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result
index db133d23f79..db133d23f79 100644
--- a/mysql-test/r/net_retry_count_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result
diff --git a/mysql-test/r/query_alloc_block_size_basic_32.result b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
index 3b7f06c8f81..3b7f06c8f81 100644
--- a/mysql-test/r/query_alloc_block_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
diff --git a/mysql-test/r/query_alloc_block_size_basic_64.result b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result
index 57c96a8168a..57c96a8168a 100644
--- a/mysql-test/r/query_alloc_block_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result
diff --git a/mysql-test/r/query_cache_limit_basic_32.result b/mysql-test/suite/sys_vars/r/query_cache_limit_basic_32.result
index bb66233732d..bb66233732d 100644
--- a/mysql-test/r/query_cache_limit_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_limit_basic_32.result
diff --git a/mysql-test/r/query_cache_limit_basic_64.result b/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result
index a592883ef91..a592883ef91 100644
--- a/mysql-test/r/query_cache_limit_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result
diff --git a/mysql-test/r/query_cache_min_res_unit_basic_32.result b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_32.result
index e0d8a0d2a30..e0d8a0d2a30 100644
--- a/mysql-test/r/query_cache_min_res_unit_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_32.result
diff --git a/mysql-test/r/query_cache_min_res_unit_basic_64.result b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result
index e1c74d2bbc1..e1c74d2bbc1 100644
--- a/mysql-test/r/query_cache_min_res_unit_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result
diff --git a/mysql-test/r/query_cache_size_basic_32.result b/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
index 1af70b3af84..1af70b3af84 100644
--- a/mysql-test/r/query_cache_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
diff --git a/mysql-test/r/query_cache_size_basic_64.result b/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result
index 0d67eec1ccc..0d67eec1ccc 100644
--- a/mysql-test/r/query_cache_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result
diff --git a/mysql-test/r/query_prealloc_size_basic_32.result b/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result
index fe8aba990a7..cd5f1727d41 100644
--- a/mysql-test/r/query_prealloc_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result
@@ -35,6 +35,10 @@ SET @@global.query_prealloc_size   = 8192;
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
 8192
+SET @@global.query_prealloc_size   = 4294967295;
+SELECT @@global.query_prealloc_size  ;
+@@global.query_prealloc_size
+4294966272
 SET @@global.query_prealloc_size   = 655354;
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
@@ -44,6 +48,10 @@ SET @@session.query_prealloc_size   = 8192;
 SELECT @@session.query_prealloc_size  ;
 @@session.query_prealloc_size
 8192
+SET @@session.query_prealloc_size   = 4294967295;
+SELECT @@session.query_prealloc_size  ;
+@@session.query_prealloc_size
+4294966272
 SET @@session.query_prealloc_size   = 655345;
 SELECT @@session.query_prealloc_size  ;
 @@session.query_prealloc_size
@@ -61,31 +69,37 @@ Warning	1292	Truncated incorrect query_prealloc_size value: '0'
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
 8192
+SET @@global.query_prealloc_size   = 429496729533;
+Warnings:
+Warning	1292	Truncated incorrect query_prealloc_size value: '429496729533'
+SELECT @@global.query_prealloc_size  ;
+@@global.query_prealloc_size
+4294966272
 SET @@global.query_prealloc_size   = 65530.34.;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
-8192
+4294966272
 SET @@global.query_prealloc_size   = test;
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
-8192
+4294966272
 SET @@global.query_prealloc_size   = "test";
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
-8192
+4294966272
 SET @@global.query_prealloc_size   = 'test';
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
-8192
+4294966272
 SET @@global.query_prealloc_size   = ON;
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
-8192
+4294966272
 SET @@session.query_prealloc_size   = 0;
 Warnings:
 Warning	1292	Truncated incorrect query_prealloc_size value: '0'
diff --git a/mysql-test/r/query_prealloc_size_basic_64.result b/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_64.result
index fe8aba990a7..0e61fbcd4b5 100644
--- a/mysql-test/r/query_prealloc_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_64.result
@@ -35,6 +35,10 @@ SET @@global.query_prealloc_size   = 8192;
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
 8192
+SET @@global.query_prealloc_size   = 4294967295;
+SELECT @@global.query_prealloc_size  ;
+@@global.query_prealloc_size
+4294966272
 SET @@global.query_prealloc_size   = 655354;
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
@@ -44,6 +48,10 @@ SET @@session.query_prealloc_size   = 8192;
 SELECT @@session.query_prealloc_size  ;
 @@session.query_prealloc_size
 8192
+SET @@session.query_prealloc_size   = 4294967295;
+SELECT @@session.query_prealloc_size  ;
+@@session.query_prealloc_size
+4294966272
 SET @@session.query_prealloc_size   = 655345;
 SELECT @@session.query_prealloc_size  ;
 @@session.query_prealloc_size
@@ -61,31 +69,35 @@ Warning	1292	Truncated incorrect query_prealloc_size value: '0'
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
 8192
+SET @@global.query_prealloc_size   = 429496729533;
+SELECT @@global.query_prealloc_size  ;
+@@global.query_prealloc_size
+429496728576
 SET @@global.query_prealloc_size   = 65530.34.;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
-8192
+429496728576
 SET @@global.query_prealloc_size   = test;
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
-8192
+429496728576
 SET @@global.query_prealloc_size   = "test";
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
-8192
+429496728576
 SET @@global.query_prealloc_size   = 'test';
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
-8192
+429496728576
 SET @@global.query_prealloc_size   = ON;
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
-8192
+429496728576
 SET @@session.query_prealloc_size   = 0;
 Warnings:
 Warning	1292	Truncated incorrect query_prealloc_size value: '0'
diff --git a/mysql-test/r/range_alloc_block_size_basic_32.result b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result
index 93441448d90..93441448d90 100644
--- a/mysql-test/r/range_alloc_block_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result
diff --git a/mysql-test/r/range_alloc_block_size_basic_64.result b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result
index 26ddfdd2bae..26ddfdd2bae 100644
--- a/mysql-test/r/range_alloc_block_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result
diff --git a/mysql-test/r/rpl_recovery_rank_basic_32.result b/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result
index d4dd46eba71..d4dd46eba71 100644
--- a/mysql-test/r/rpl_recovery_rank_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result
diff --git a/mysql-test/r/rpl_recovery_rank_basic_64.result b/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result
index d4dd46eba71..74a47fa0f08 100644
--- a/mysql-test/r/rpl_recovery_rank_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result
@@ -22,26 +22,20 @@ SELECT @@global.rpl_recovery_rank;
 @@global.rpl_recovery_rank
 123456789
 SET @@global.rpl_recovery_rank = 2147483648*2;
-Warnings:
-Warning	1292	Truncated incorrect rpl-recovery-rank value: '4294967296'
 SELECT @@global.rpl_recovery_rank;
 @@global.rpl_recovery_rank
-4294967295
+4294967296
 SET @@global.rpl_recovery_rank = 2147483648*1024;
-Warnings:
-Warning	1292	Truncated incorrect rpl-recovery-rank value: '2199023255552'
 SELECT @@global.rpl_recovery_rank;
 @@global.rpl_recovery_rank
-4294967295
+2199023255552
 SELECT @@global.rpl_recovery_rank;
 @@global.rpl_recovery_rank
-4294967295
+2199023255552
 SET @@global.rpl_recovery_rank = 2147483648*2147483648;
-Warnings:
-Warning	1292	Truncated incorrect rpl-recovery-rank value: '4611686018427387904'
 SELECT @@global.rpl_recovery_rank;
 @@global.rpl_recovery_rank
-4294967295
+4611686018427387904
 '#--------------------FN_DYNVARS_142_03-------------------------#'
 SET @@rpl_recovery_rank = 2;
 ERROR HY000: Variable 'rpl_recovery_rank' is a GLOBAL variable and should be set with SET GLOBAL
diff --git a/mysql-test/r/server_id_basic_32.result b/mysql-test/suite/sys_vars/r/server_id_basic_32.result
index 6f801fc627b..6f801fc627b 100644
--- a/mysql-test/r/server_id_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/server_id_basic_32.result
diff --git a/mysql-test/r/server_id_basic_64.result b/mysql-test/suite/sys_vars/r/server_id_basic_64.result
index b6f3095ccfe..b6f3095ccfe 100644
--- a/mysql-test/r/server_id_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/server_id_basic_64.result
diff --git a/mysql-test/r/slave_transaction_retries_basic_32.result b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_32.result
index 5b77c500aa0..5b77c500aa0 100644
--- a/mysql-test/r/slave_transaction_retries_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_32.result
diff --git a/mysql-test/r/slave_transaction_retries_basic_64.result b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result
index 9434b14b238..9434b14b238 100644
--- a/mysql-test/r/slave_transaction_retries_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result
diff --git a/mysql-test/r/sort_buffer_size_basic_32.result b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result
index 09a1fe59046..09a1fe59046 100644
--- a/mysql-test/r/sort_buffer_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result
diff --git a/mysql-test/r/sort_buffer_size_basic_64.result b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
index e9bd14abc67..e9bd14abc67 100644
--- a/mysql-test/r/sort_buffer_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
diff --git a/mysql-test/r/sync_binlog_basic_32.result b/mysql-test/suite/sys_vars/r/sync_binlog_basic_32.result
index 3d9bfb6d218..3d9bfb6d218 100644
--- a/mysql-test/r/sync_binlog_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/sync_binlog_basic_32.result
diff --git a/mysql-test/r/sync_binlog_basic_64.result b/mysql-test/suite/sys_vars/r/sync_binlog_basic_64.result
index ffd1b3fc4f1..ffd1b3fc4f1 100644
--- a/mysql-test/r/sync_binlog_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/sync_binlog_basic_64.result
diff --git a/mysql-test/r/timestamp_basic_32.result b/mysql-test/suite/sys_vars/r/timestamp_basic_32.result
index cc4f0324c0f..cc4f0324c0f 100644
--- a/mysql-test/r/timestamp_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/timestamp_basic_32.result
diff --git a/mysql-test/r/timestamp_basic_64.result b/mysql-test/suite/sys_vars/r/timestamp_basic_64.result
index df877cd455b..df877cd455b 100644
--- a/mysql-test/r/timestamp_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/timestamp_basic_64.result
diff --git a/mysql-test/r/tmp_table_size_basic_32.result b/mysql-test/suite/sys_vars/r/tmp_table_size_basic_32.result
index aeafd95ed55..aeafd95ed55 100644
--- a/mysql-test/r/tmp_table_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/tmp_table_size_basic_32.result
diff --git a/mysql-test/r/tmp_table_size_basic_64.result b/mysql-test/suite/sys_vars/r/tmp_table_size_basic_64.result
index 837b90fc143..837b90fc143 100644
--- a/mysql-test/r/tmp_table_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/tmp_table_size_basic_64.result
diff --git a/mysql-test/r/transaction_alloc_block_size_basic_32.result b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
index 706d7802ed3..706d7802ed3 100644
--- a/mysql-test/r/transaction_alloc_block_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
diff --git a/mysql-test/r/transaction_alloc_block_size_basic_64.result b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result
index c968d6f108c..c968d6f108c 100644
--- a/mysql-test/r/transaction_alloc_block_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result
diff --git a/mysql-test/r/transaction_prealloc_size_basic_32.result b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result
index 3df7a55595e..3df7a55595e 100644
--- a/mysql-test/r/transaction_prealloc_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result
diff --git a/mysql-test/r/transaction_prealloc_size_basic_64.result b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result
index 2fb6451372f..2fb6451372f 100644
--- a/mysql-test/r/transaction_prealloc_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result
diff --git a/mysql-test/r/wait_timeout_basic_32.result b/mysql-test/suite/sys_vars/r/wait_timeout_basic_32.result
index ae03e677e56..ae03e677e56 100644
--- a/mysql-test/r/wait_timeout_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/wait_timeout_basic_32.result
diff --git a/mysql-test/r/wait_timeout_basic_64.result b/mysql-test/suite/sys_vars/r/wait_timeout_basic_64.result
index ae03e677e56..ae03e677e56 100644
--- a/mysql-test/r/wait_timeout_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/wait_timeout_basic_64.result
diff --git a/mysql-test/t/binlog_cache_size_basic_32.test b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test
index a809c00f987..1c6d805683f 100644
--- a/mysql-test/t/binlog_cache_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/binlog_cache_size_basic.inc
+--source suite/sys_vars/inc/binlog_cache_size_basic.inc
 
diff --git a/mysql-test/t/binlog_cache_size_basic_64.test b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test
index f4fdf8c2129..1074bb46069 100644
--- a/mysql-test/t/binlog_cache_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/binlog_cache_size_basic.inc
+--source suite/sys_vars/inc/binlog_cache_size_basic.inc
 
diff --git a/mysql-test/t/bulk_insert_buffer_size_basic_32.test b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test
index 76a418323bc..84a90d42bec 100644
--- a/mysql-test/t/bulk_insert_buffer_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/bulk_insert_buffer_size_basic.inc
+--source suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc
 
diff --git a/mysql-test/t/bulk_insert_buffer_size_basic_64.test b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test
index 6363cfc12d1..4727daf0b4b 100644
--- a/mysql-test/t/bulk_insert_buffer_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/bulk_insert_buffer_size_basic.inc
+--source suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc
 
diff --git a/mysql-test/t/delayed_insert_limit_basic_32.test b/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test
index d7a4a81542f..7cbce057bec 100644
--- a/mysql-test/t/delayed_insert_limit_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/delayed_insert_limit_basic.inc
+--source suite/sys_vars/inc/delayed_insert_limit_basic.inc
 
diff --git a/mysql-test/t/delayed_insert_limit_basic_64.test b/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test
index c1d628bbb34..fbc31e937fe 100644
--- a/mysql-test/t/delayed_insert_limit_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/delayed_insert_limit_basic.inc
+--source suite/sys_vars/inc/delayed_insert_limit_basic.inc
 
diff --git a/mysql-test/t/delayed_queue_size_basic_32.test b/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test
index 06e0cf48dac..1e67d426f10 100644
--- a/mysql-test/t/delayed_queue_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/delayed_queue_size_basic.inc
+--source suite/sys_vars/inc/delayed_queue_size_basic.inc
 
diff --git a/mysql-test/t/delayed_queue_size_basic_64.test b/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test
index a9a929ae07b..44d5839759c 100644
--- a/mysql-test/t/delayed_queue_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/delayed_queue_size_basic.inc
+--source suite/sys_vars/inc/delayed_queue_size_basic.inc
 
diff --git a/mysql-test/t/innodb_concurrency_tickets_basic_32.test b/mysql-test/suite/sys_vars/t/innodb_concurrency_tickets_basic_32.test
index e587d1870bf..13e1b205a4d 100644
--- a/mysql-test/t/innodb_concurrency_tickets_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/innodb_concurrency_tickets_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/innodb_concurrency_tickets_basic.inc
+--source suite/sys_vars/inc/innodb_concurrency_tickets_basic.inc
 
diff --git a/mysql-test/t/innodb_concurrency_tickets_basic_64.test b/mysql-test/suite/sys_vars/t/innodb_concurrency_tickets_basic_64.test
index bec46df3d9a..fc26c903de5 100644
--- a/mysql-test/t/innodb_concurrency_tickets_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/innodb_concurrency_tickets_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/innodb_concurrency_tickets_basic.inc
+--source suite/sys_vars/inc/innodb_concurrency_tickets_basic.inc
 
diff --git a/mysql-test/t/innodb_max_purge_lag_basic_32.test b/mysql-test/suite/sys_vars/t/innodb_max_purge_lag_basic_32.test
index 4e5b019b151..8396755844e 100644
--- a/mysql-test/t/innodb_max_purge_lag_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/innodb_max_purge_lag_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/innodb_max_purge_lag_basic.inc
+--source suite/sys_vars/inc/innodb_max_purge_lag_basic.inc
 
diff --git a/mysql-test/t/innodb_max_purge_lag_basic_64.test b/mysql-test/suite/sys_vars/t/innodb_max_purge_lag_basic_64.test
index 5980e8ed12e..4744cee20d9 100644
--- a/mysql-test/t/innodb_max_purge_lag_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/innodb_max_purge_lag_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/innodb_max_purge_lag_basic.inc
+--source suite/sys_vars/inc/innodb_max_purge_lag_basic.inc
 
diff --git a/mysql-test/t/innodb_sync_spin_loops_basic_32.test b/mysql-test/suite/sys_vars/t/innodb_sync_spin_loops_basic_32.test
index ffb766b3ec8..981b6c4e992 100644
--- a/mysql-test/t/innodb_sync_spin_loops_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/innodb_sync_spin_loops_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/innodb_sync_spin_loops_basic.inc
+--source suite/sys_vars/inc/innodb_sync_spin_loops_basic.inc
 
diff --git a/mysql-test/t/innodb_sync_spin_loops_basic_64.test b/mysql-test/suite/sys_vars/t/innodb_sync_spin_loops_basic_64.test
index f854bf475d6..ab7c01c5b6d 100644
--- a/mysql-test/t/innodb_sync_spin_loops_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/innodb_sync_spin_loops_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/innodb_sync_spin_loops_basic.inc
+--source suite/sys_vars/inc/innodb_sync_spin_loops_basic.inc
 
diff --git a/mysql-test/t/join_buffer_size_basic_32.test b/mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test
index e904f2de426..f6b35b89644 100644
--- a/mysql-test/t/join_buffer_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/join_buffer_size_basic.inc
+--source suite/sys_vars/inc/join_buffer_size_basic.inc
 
diff --git a/mysql-test/t/join_buffer_size_basic_64.test b/mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test
index 6de911be04c..5632471235f 100644
--- a/mysql-test/t/join_buffer_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/join_buffer_size_basic.inc
+--source suite/sys_vars/inc/join_buffer_size_basic.inc
 
diff --git a/mysql-test/t/key_buffer_size_basic_32.test b/mysql-test/suite/sys_vars/t/key_buffer_size_basic_32.test
index 78051382f73..086e51e185c 100644
--- a/mysql-test/t/key_buffer_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/key_buffer_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/key_buffer_size_basic.inc
+--source suite/sys_vars/inc/key_buffer_size_basic.inc
 
diff --git a/mysql-test/t/key_buffer_size_basic_64.test b/mysql-test/suite/sys_vars/t/key_buffer_size_basic_64.test
index ed8409fa70c..5604c56480b 100644
--- a/mysql-test/t/key_buffer_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/key_buffer_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/key_buffer_size_basic.inc
+--source suite/sys_vars/inc/key_buffer_size_basic.inc
 
diff --git a/mysql-test/t/key_cache_age_threshold_basic_32.test b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test
index 13e7367f2ed..8a234d9d300 100644
--- a/mysql-test/t/key_cache_age_threshold_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/key_cache_age_threshold_basic.inc
+--source suite/sys_vars/inc/key_cache_age_threshold_basic.inc
 
diff --git a/mysql-test/t/key_cache_age_threshold_basic_64.test b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test
index 6524ec89127..32f98cba941 100644
--- a/mysql-test/t/key_cache_age_threshold_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/key_cache_age_threshold_basic.inc
+--source suite/sys_vars/inc/key_cache_age_threshold_basic.inc
 
diff --git a/mysql-test/t/key_cache_block_size_basic_32.test b/mysql-test/suite/sys_vars/t/key_cache_block_size_basic_32.test
index 63d71016657..db0c0bd67a2 100644
--- a/mysql-test/t/key_cache_block_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/key_cache_block_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/key_cache_block_size_basic.inc
+--source suite/sys_vars/inc/key_cache_block_size_basic.inc
 
diff --git a/mysql-test/t/key_cache_block_size_basic_64.test b/mysql-test/suite/sys_vars/t/key_cache_block_size_basic_64.test
index 0b6fb16238e..7403d762dc4 100644
--- a/mysql-test/t/key_cache_block_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/key_cache_block_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/key_cache_block_size_basic.inc
+--source suite/sys_vars/inc/key_cache_block_size_basic.inc
 
diff --git a/mysql-test/t/key_cache_division_limit_basic_32.test b/mysql-test/suite/sys_vars/t/key_cache_division_limit_basic_32.test
index c8ec6cca3a3..fcc28438866 100644
--- a/mysql-test/t/key_cache_division_limit_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/key_cache_division_limit_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/key_cache_division_limit_basic.inc
+--source suite/sys_vars/inc/key_cache_division_limit_basic.inc
 
diff --git a/mysql-test/t/key_cache_division_limit_basic_64.test b/mysql-test/suite/sys_vars/t/key_cache_division_limit_basic_64.test
index 3b4e3ccaa99..ac4dd1c96d3 100644
--- a/mysql-test/t/key_cache_division_limit_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/key_cache_division_limit_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/key_cache_division_limit_basic.inc
+--source suite/sys_vars/inc/key_cache_division_limit_basic.inc
 
diff --git a/mysql-test/t/log_warnings_basic_32.test b/mysql-test/suite/sys_vars/t/log_warnings_basic_32.test
index b6d1d0d6382..a63cbed2aa3 100644
--- a/mysql-test/t/log_warnings_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/log_warnings_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/log_warnings_basic.inc
+--source suite/sys_vars/inc/log_warnings_basic.inc
 
diff --git a/mysql-test/t/log_warnings_basic_64.test b/mysql-test/suite/sys_vars/t/log_warnings_basic_64.test
index c11381735be..5a8ad5482a5 100644
--- a/mysql-test/t/log_warnings_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/log_warnings_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/log_warnings_basic.inc
+--source suite/sys_vars/inc/log_warnings_basic.inc
 
diff --git a/mysql-test/t/max_binlog_cache_size_basic_32.test b/mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic_32.test
index ba9c4d5136a..51386b1f994 100644
--- a/mysql-test/t/max_binlog_cache_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/max_binlog_cache_size_basic.inc
+--source suite/sys_vars/inc/max_binlog_cache_size_basic.inc
 
diff --git a/mysql-test/t/max_binlog_cache_size_basic_64.test b/mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic_64.test
index ba3949ba90c..c7c757341fa 100644
--- a/mysql-test/t/max_binlog_cache_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/max_binlog_cache_size_basic.inc
+--source suite/sys_vars/inc/max_binlog_cache_size_basic.inc
 
diff --git a/mysql-test/t/max_connect_errors_basic_32.test b/mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test
index 9f6e1dad6a8..62c7ec71568 100644
--- a/mysql-test/t/max_connect_errors_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/max_connect_errors_basic.inc
+--source suite/sys_vars/inc/max_connect_errors_basic.inc
 
diff --git a/mysql-test/t/max_connect_errors_basic_64.test b/mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test
index 6a3d1be6978..f27135d53c7 100644
--- a/mysql-test/t/max_connect_errors_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/max_connect_errors_basic.inc
+--source suite/sys_vars/inc/max_connect_errors_basic.inc
 
diff --git a/mysql-test/t/max_heap_table_size_basic_32.test b/mysql-test/suite/sys_vars/t/max_heap_table_size_basic_32.test
index 38684f307c2..180c41a5ecf 100644
--- a/mysql-test/t/max_heap_table_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/max_heap_table_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/max_heap_table_size_basic.inc
+--source suite/sys_vars/inc/max_heap_table_size_basic.inc
 
diff --git a/mysql-test/t/max_heap_table_size_basic_64.test b/mysql-test/suite/sys_vars/t/max_heap_table_size_basic_64.test
index 76f1b658da1..89d234f5399 100644
--- a/mysql-test/t/max_heap_table_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/max_heap_table_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/max_heap_table_size_basic.inc
+--source suite/sys_vars/inc/max_heap_table_size_basic.inc
 
diff --git a/mysql-test/t/max_seeks_for_key_basic_32.test b/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test
index d7b9ce7f834..84d76c7cb43 100644
--- a/mysql-test/t/max_seeks_for_key_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/max_seeks_for_key_basic.inc
+--source suite/sys_vars/inc/max_seeks_for_key_basic.inc
 
diff --git a/mysql-test/t/max_seeks_for_key_basic_64.test b/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test
index f700aafa044..63c0c1d6a6b 100644
--- a/mysql-test/t/max_seeks_for_key_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/max_seeks_for_key_basic.inc
+--source suite/sys_vars/inc/max_seeks_for_key_basic.inc
 
diff --git a/mysql-test/t/max_tmp_tables_basic_32.test b/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test
index 98da87421b7..95ce399e68e 100644
--- a/mysql-test/t/max_tmp_tables_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/max_tmp_tables_basic.inc
+--source suite/sys_vars/inc/max_tmp_tables_basic.inc
 
diff --git a/mysql-test/t/max_tmp_tables_basic_64.test b/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test
index 81aa478b7af..573e5a75230 100644
--- a/mysql-test/t/max_tmp_tables_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/max_tmp_tables_basic.inc
+--source suite/sys_vars/inc/max_tmp_tables_basic.inc
 
diff --git a/mysql-test/t/max_write_lock_count_basic_32.test b/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test
index c33ffc53d6c..b4953208976 100644
--- a/mysql-test/t/max_write_lock_count_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/max_write_lock_count_basic.inc
+--source suite/sys_vars/inc/max_write_lock_count_basic.inc
 
diff --git a/mysql-test/t/max_write_lock_count_basic_64.test b/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test
index de1d2194c33..b0c5dabac07 100644
--- a/mysql-test/t/max_write_lock_count_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/max_write_lock_count_basic.inc
+--source suite/sys_vars/inc/max_write_lock_count_basic.inc
 
diff --git a/mysql-test/t/min_examined_row_limit_basic_32.test b/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test
index bbc3b6029d8..de53be3cb7c 100644
--- a/mysql-test/t/min_examined_row_limit_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/min_examined_row_limit_basic.inc
+--source suite/sys_vars/inc/min_examined_row_limit_basic.inc
 
diff --git a/mysql-test/t/min_examined_row_limit_basic_64.test b/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test
index 93cc4eda99d..449b5d5525e 100644
--- a/mysql-test/t/min_examined_row_limit_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/min_examined_row_limit_basic.inc
+--source suite/sys_vars/inc/min_examined_row_limit_basic.inc
 
diff --git a/mysql-test/t/multi_range_count_basic_32.test b/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test
index a2487ebc154..f9db6632d33 100644
--- a/mysql-test/t/multi_range_count_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/multi_range_count_basic.inc
+--source suite/sys_vars/inc/multi_range_count_basic.inc
 
diff --git a/mysql-test/t/multi_range_count_basic_64.test b/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test
index 0dd1ab50e4b..12ad7588bbd 100644
--- a/mysql-test/t/multi_range_count_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/multi_range_count_basic.inc
+--source suite/sys_vars/inc/multi_range_count_basic.inc
 
diff --git a/mysql-test/t/myisam_max_sort_file_size_basic_32.test b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test
index 5ff3a35a61f..6c0ff16bc6f 100644
--- a/mysql-test/t/myisam_max_sort_file_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/myisam_max_sort_file_size_basic.inc
+--source suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc
 
diff --git a/mysql-test/t/myisam_max_sort_file_size_basic_64.test b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test
index e3846e2ccdc..108cc2e2350 100644
--- a/mysql-test/t/myisam_max_sort_file_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/myisam_max_sort_file_size_basic.inc
+--source suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc
 
diff --git a/mysql-test/t/myisam_repair_threads_basic_32.test b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test
index 7f0f0785f09..f395ffe8ee0 100644
--- a/mysql-test/t/myisam_repair_threads_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/myisam_repair_threads_basic.inc
+--source suite/sys_vars/inc/myisam_repair_threads_basic.inc
 
diff --git a/mysql-test/t/myisam_repair_threads_basic_64.test b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test
index f1870409c28..21ed5fd9c5f 100644
--- a/mysql-test/t/myisam_repair_threads_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/myisam_repair_threads_basic.inc
+--source suite/sys_vars/inc/myisam_repair_threads_basic.inc
 
diff --git a/mysql-test/t/myisam_sort_buffer_size_basic_32.test b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test
index d87a2015407..9c4116758f7 100644
--- a/mysql-test/t/myisam_sort_buffer_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/myisam_sort_buffer_size_basic.inc
+--source suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc
 
diff --git a/mysql-test/t/myisam_sort_buffer_size_basic_64.test b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test
index fd1c3c30e7d..70f8a33ed4d 100644
--- a/mysql-test/t/myisam_sort_buffer_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/myisam_sort_buffer_size_basic.inc
+--source suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc
 
diff --git a/mysql-test/t/net_retry_count_basic_32.test b/mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test
index 1f7a4f1cb80..56f0e56f100 100644
--- a/mysql-test/t/net_retry_count_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/net_retry_count_basic.inc
+--source suite/sys_vars/inc/net_retry_count_basic.inc
 
diff --git a/mysql-test/t/net_retry_count_basic_64.test b/mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test
index 08839b673f2..cb1fe8beebb 100644
--- a/mysql-test/t/net_retry_count_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/net_retry_count_basic.inc
+--source suite/sys_vars/inc/net_retry_count_basic.inc
 
diff --git a/mysql-test/t/query_alloc_block_size_basic_32.test b/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test
index 281698c4179..471b48c3059 100644
--- a/mysql-test/t/query_alloc_block_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/query_alloc_block_size_basic.inc
+--source suite/sys_vars/inc/query_alloc_block_size_basic.inc
 
diff --git a/mysql-test/t/query_alloc_block_size_basic_64.test b/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test
index 70f2f37d36b..64517899171 100644
--- a/mysql-test/t/query_alloc_block_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/query_alloc_block_size_basic.inc
+--source suite/sys_vars/inc/query_alloc_block_size_basic.inc
 
diff --git a/mysql-test/t/query_cache_limit_basic_32.test b/mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test
index cd5f94112a0..0416fc46349 100644
--- a/mysql-test/t/query_cache_limit_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/query_cache_limit_basic.inc
+--source suite/sys_vars/inc/query_cache_limit_basic.inc
 
diff --git a/mysql-test/t/query_cache_limit_basic_64.test b/mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test
index a3ebae0b244..0d134449bf9 100644
--- a/mysql-test/t/query_cache_limit_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/query_cache_limit_basic.inc
+--source suite/sys_vars/inc/query_cache_limit_basic.inc
 
diff --git a/mysql-test/t/query_cache_min_res_unit_basic_32.test b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test
index 4f3740ea872..1288157d102 100644
--- a/mysql-test/t/query_cache_min_res_unit_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/query_cache_min_res_unit_basic.inc
+--source suite/sys_vars/inc/query_cache_min_res_unit_basic.inc
 
diff --git a/mysql-test/t/query_cache_min_res_unit_basic_64.test b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test
index b35b07d4f1e..e941b55ab52 100644
--- a/mysql-test/t/query_cache_min_res_unit_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/query_cache_min_res_unit_basic.inc
+--source suite/sys_vars/inc/query_cache_min_res_unit_basic.inc
 
diff --git a/mysql-test/t/query_cache_size_basic_32.test b/mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test
index 500bdbda5dd..17fd1bb41ab 100644
--- a/mysql-test/t/query_cache_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/query_cache_size_basic.inc
+--source suite/sys_vars/inc/query_cache_size_basic.inc
 
diff --git a/mysql-test/t/query_cache_size_basic_64.test b/mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test
index d53be96a28b..ba0cddc5a3a 100644
--- a/mysql-test/t/query_cache_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/query_cache_size_basic.inc
+--source suite/sys_vars/inc/query_cache_size_basic.inc
 
diff --git a/mysql-test/t/query_prealloc_size_basic_32.test b/mysql-test/suite/sys_vars/t/query_prealloc_size_basic_32.test
index ae919cd8d9e..34dafc71c9c 100644
--- a/mysql-test/t/query_prealloc_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/query_prealloc_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/query_prealloc_size_basic.inc
+--source suite/sys_vars/inc/query_prealloc_size_basic.inc
 
diff --git a/mysql-test/t/query_prealloc_size_basic_64.test b/mysql-test/suite/sys_vars/t/query_prealloc_size_basic_64.test
index 532336e225e..c1f04c0788c 100644
--- a/mysql-test/t/query_prealloc_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/query_prealloc_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/query_prealloc_size_basic.inc
+--source suite/sys_vars/inc/query_prealloc_size_basic.inc
 
diff --git a/mysql-test/t/range_alloc_block_size_basic_32.test b/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test
index 247e92cd362..14cdc82f7c4 100644
--- a/mysql-test/t/range_alloc_block_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/range_alloc_block_size_basic.inc
+--source suite/sys_vars/inc/range_alloc_block_size_basic.inc
 
diff --git a/mysql-test/t/range_alloc_block_size_basic_64.test b/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test
index a9601d770c0..a4125b14fd0 100644
--- a/mysql-test/t/range_alloc_block_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/range_alloc_block_size_basic.inc
+--source suite/sys_vars/inc/range_alloc_block_size_basic.inc
 
diff --git a/mysql-test/t/rpl_recovery_rank_basic_32.test b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test
index d35878e153c..c28282dd38b 100644
--- a/mysql-test/t/rpl_recovery_rank_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/rpl_recovery_rank_basic.inc
+--source suite/sys_vars/inc/rpl_recovery_rank_basic.inc
 
diff --git a/mysql-test/t/rpl_recovery_rank_basic_64.test b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test
index 6fe04f26442..51895efa65e 100644
--- a/mysql-test/t/rpl_recovery_rank_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/rpl_recovery_rank_basic.inc
+--source suite/sys_vars/inc/rpl_recovery_rank_basic.inc
 
diff --git a/mysql-test/t/server_id_basic_32.test b/mysql-test/suite/sys_vars/t/server_id_basic_32.test
index b7c4c603803..e01b271e002 100644
--- a/mysql-test/t/server_id_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/server_id_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/server_id_basic.inc
+--source suite/sys_vars/inc/server_id_basic.inc
 
diff --git a/mysql-test/t/server_id_basic_64.test b/mysql-test/suite/sys_vars/t/server_id_basic_64.test
index 67653e0503e..4ef870aa977 100644
--- a/mysql-test/t/server_id_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/server_id_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/server_id_basic.inc
+--source suite/sys_vars/inc/server_id_basic.inc
 
diff --git a/mysql-test/t/slave_transaction_retries_basic_32.test b/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test
index c19297ba72f..8f3147ddab4 100644
--- a/mysql-test/t/slave_transaction_retries_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/slave_transaction_retries_basic.inc
+--source suite/sys_vars/inc/slave_transaction_retries_basic.inc
 
diff --git a/mysql-test/t/slave_transaction_retries_basic_64.test b/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test
index e07f96edf3f..dfd52507f61 100644
--- a/mysql-test/t/slave_transaction_retries_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/slave_transaction_retries_basic.inc
+--source suite/sys_vars/inc/slave_transaction_retries_basic.inc
 
diff --git a/mysql-test/t/sort_buffer_size_basic_32.test b/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test
index 8c86fe7786a..d63cc997f5b 100644
--- a/mysql-test/t/sort_buffer_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/sort_buffer_size_basic.inc
+--source suite/sys_vars/inc/sort_buffer_size_basic.inc
 
diff --git a/mysql-test/t/sort_buffer_size_basic_64.test b/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test
index 86081b3820b..4c7a16bd014 100644
--- a/mysql-test/t/sort_buffer_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/sort_buffer_size_basic.inc
+--source suite/sys_vars/inc/sort_buffer_size_basic.inc
 
diff --git a/mysql-test/t/sync_binlog_basic_32.test b/mysql-test/suite/sys_vars/t/sync_binlog_basic_32.test
index 3acd76b7e72..275b95cf775 100644
--- a/mysql-test/t/sync_binlog_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/sync_binlog_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/sync_binlog_basic.inc
+--source suite/sys_vars/inc/sync_binlog_basic.inc
 
diff --git a/mysql-test/t/sync_binlog_basic_64.test b/mysql-test/suite/sys_vars/t/sync_binlog_basic_64.test
index 9f605445ded..e6f9bf668a0 100644
--- a/mysql-test/t/sync_binlog_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/sync_binlog_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/sync_binlog_basic.inc
+--source suite/sys_vars/inc/sync_binlog_basic.inc
 
diff --git a/mysql-test/t/timestamp_basic_32.test b/mysql-test/suite/sys_vars/t/timestamp_basic_32.test
index 72371c154fc..a2b6139aef9 100644
--- a/mysql-test/t/timestamp_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/timestamp_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/timestamp_basic.inc
+--source suite/sys_vars/inc/timestamp_basic.inc
 
diff --git a/mysql-test/t/timestamp_basic_64.test b/mysql-test/suite/sys_vars/t/timestamp_basic_64.test
index 4614e470a4c..fbc86316ed9 100644
--- a/mysql-test/t/timestamp_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/timestamp_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/timestamp_basic.inc
+--source suite/sys_vars/inc/timestamp_basic.inc
 
diff --git a/mysql-test/t/tmp_table_size_basic_32.test b/mysql-test/suite/sys_vars/t/tmp_table_size_basic_32.test
index 19d54251c5e..c772b5c896c 100644
--- a/mysql-test/t/tmp_table_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/tmp_table_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/tmp_table_size_basic.inc
+--source suite/sys_vars/inc/tmp_table_size_basic.inc
 
diff --git a/mysql-test/t/tmp_table_size_basic_64.test b/mysql-test/suite/sys_vars/t/tmp_table_size_basic_64.test
index ddd865f6383..46b3f65be9a 100644
--- a/mysql-test/t/tmp_table_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/tmp_table_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/tmp_table_size_basic.inc
+--source suite/sys_vars/inc/tmp_table_size_basic.inc
 
diff --git a/mysql-test/t/transaction_alloc_block_size_basic_32.test b/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test
index a714a4f5a30..b9fbf429220 100644
--- a/mysql-test/t/transaction_alloc_block_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/transaction_alloc_block_size_basic.inc
+--source suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
 
diff --git a/mysql-test/t/transaction_alloc_block_size_basic_64.test b/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test
index b6ebe36c35f..fb68245ee62 100644
--- a/mysql-test/t/transaction_alloc_block_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/transaction_alloc_block_size_basic.inc
+--source suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
 
diff --git a/mysql-test/t/transaction_prealloc_size_basic_32.test b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test
index 868e281d30e..23ea53334ff 100644
--- a/mysql-test/t/transaction_prealloc_size_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/transaction_prealloc_size_basic.inc
+--source suite/sys_vars/inc/transaction_prealloc_size_basic.inc
 
diff --git a/mysql-test/t/transaction_prealloc_size_basic_64.test b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test
index 5487d06f521..79a18585e80 100644
--- a/mysql-test/t/transaction_prealloc_size_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/transaction_prealloc_size_basic.inc
+--source suite/sys_vars/inc/transaction_prealloc_size_basic.inc
 
diff --git a/mysql-test/t/wait_timeout_basic_32.test b/mysql-test/suite/sys_vars/t/wait_timeout_basic_32.test
index 88d60333138..613a5543b14 100644
--- a/mysql-test/t/wait_timeout_basic_32.test
+++ b/mysql-test/suite/sys_vars/t/wait_timeout_basic_32.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_32bit.inc
---source include/wait_timeout_basic.inc
+--source suite/sys_vars/inc/wait_timeout_basic.inc
 
diff --git a/mysql-test/t/wait_timeout_basic_64.test b/mysql-test/suite/sys_vars/t/wait_timeout_basic_64.test
index 76dcd6fcc91..d1138cbc105 100644
--- a/mysql-test/t/wait_timeout_basic_64.test
+++ b/mysql-test/suite/sys_vars/t/wait_timeout_basic_64.test
@@ -5,5 +5,5 @@
 ################################################################################
 
 --source include/have_64bit.inc
---source include/wait_timeout_basic.inc
+--source suite/sys_vars/inc/wait_timeout_basic.inc
 
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index d5c928213fe..24935ce397d 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -12,88 +12,6 @@
 federated_transactions   : Bug#29523 Transactions do not work
 csv_alter_table      : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
 thread_cache_size_func : Bug#36733 main.thread_cache_size_func fails randomly
-binlog_cache_size_basic_32            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-bulk_insert_buffer_size_basic_32      : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-delayed_insert_limit_basic_32         : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-delayed_queue_size_basic_32           : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-innodb_concurrency_tickets_basic_32   : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-innodb_max_purge_lag_basic_32         : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-innodb_sync_spin_loops_basic_32       : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-join_buffer_size_basic_32             : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-key_buffer_size_basic_32              : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-key_cache_age_threshold_basic_32      : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-key_cache_block_size_basic_32         : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-key_cache_division_limit_basic_32     : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-log_warnings_basic_32                 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-max_binlog_cache_size_basic_32        : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-max_connect_errors_basic_32           : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-max_heap_table_size_basic_32          : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-max_seeks_for_key_basic_32            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-max_tmp_tables_basic_32               : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-max_write_lock_count_basic_32         : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-min_examined_row_limit_basic_32       : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-multi_range_count_basic_32            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-myisam_max_sort_file_size_basic_32    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-myisam_repair_threads_basic_32        : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-myisam_sort_buffer_size_basic_32      : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-net_retry_count_basic_32              : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-query_alloc_block_size_basic_32       : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-query_cache_limit_basic_32            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-query_cache_min_res_unit_basic_32     : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-query_cache_size_basic_32             : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-query_prealloc_size_basic_32          : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-range_alloc_block_size_basic_32       : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-rpl_recovery_rank_basic_32            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-server_id_basic_32                    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-slave_transaction_retries_basic_32    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-sort_buffer_size_basic_32             : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-sync_binlog_basic_32                  : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-timestamp_basic_32                    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-tmp_table_size_basic_32               : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-transaction_alloc_block_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-transaction_prealloc_size_basic_32    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-wait_timeout_basic_32                 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-binlog_cache_size_basic_64            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-bulk_insert_buffer_size_basic_64      : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-delayed_insert_limit_basic_64         : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-delayed_queue_size_basic_64           : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-innodb_concurrency_tickets_basic_64   : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-innodb_max_purge_lag_basic_64         : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-innodb_sync_spin_loops_basic_64       : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-join_buffer_size_basic_64             : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-key_buffer_size_basic_64              : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-key_cache_age_threshold_basic_64      : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-key_cache_block_size_basic_64         : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-key_cache_division_limit_basic_64     : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-log_warnings_basic_64                 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-max_binlog_cache_size_basic_64        : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-max_connect_errors_basic_64           : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-max_heap_table_size_basic_64          : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-max_seeks_for_key_basic_64            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-max_tmp_tables_basic_64               : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-max_write_lock_count_basic_64         : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-min_examined_row_limit_basic_64       : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-multi_range_count_basic_64            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-myisam_max_sort_file_size_basic_64    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-myisam_repair_threads_basic_64        : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-myisam_sort_buffer_size_basic_64      : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-net_retry_count_basic_64              : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-query_alloc_block_size_basic_64       : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-query_cache_limit_basic_64            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-query_cache_min_res_unit_basic_64     : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-query_cache_size_basic_64             : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-query_prealloc_size_basic_64          : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-range_alloc_block_size_basic_64       : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-rpl_recovery_rank_basic_64            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-server_id_basic_64                    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-slave_transaction_retries_basic_64    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-sort_buffer_size_basic_64             : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-sync_binlog_basic_64                  : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-timestamp_basic_64                    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-tmp_table_size_basic_64               : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-transaction_alloc_block_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-transaction_prealloc_size_basic_64    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-wait_timeout_basic_64                 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
 log_tables.test                       : Bug #37798: main.log_tables fails randomly on powermacg5 and windows
 wait_timeout_func                     : BUG#36873 2008-07-06 sven wait_timeout_func.test fails randomly
 delayed_insert_limit_func             : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
diff --git a/mysql-test/t/func_if.test b/mysql-test/t/func_if.test
index 5373ca3fec6..8da10f36cbe 100644
--- a/mysql-test/t/func_if.test
+++ b/mysql-test/t/func_if.test
@@ -108,3 +108,46 @@ drop table t1;
 select if(0, 18446744073709551610, 18446744073709551610);
 
 
+#
+# Bug #37662: nested if() inside sum() is parsed in exponential time
+#
+
+CREATE TABLE t1(a DECIMAL(10,3));
+
+# check : should be fast. more than few secs means failure.
+SELECT t1.a,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,
+ IF((ROUND(t1.a,2)=1), 2,0)))))))))))))))))))))))))))))) + 1
+FROM t1;
+
+DROP TABLE t1;
+
+--echo End of 5.0 tests
diff --git a/mysql-test/t/innodb-autoinc-optimize.test b/mysql-test/t/innodb-autoinc-optimize.test
new file mode 100644
index 00000000000..c7e22a8ff40
--- /dev/null
+++ b/mysql-test/t/innodb-autoinc-optimize.test
@@ -0,0 +1,16 @@
+-- source include/have_innodb.inc
+# embedded server ignores 'delayed', so skip this
+-- source include/not_embedded.inc
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+#
+# Bug 34286
+#
+create table t1(a int not null auto_increment primary key) engine=innodb;
+insert into t1 set a = -1;
+# NOTE: The database needs to be shutdown and restarted (here) for
+# the test to work. It's included for reference only.
+optimize table t1;
diff --git a/mysql-test/t/innodb_bug35220.test b/mysql-test/t/innodb_bug35220.test
new file mode 100644
index 00000000000..26f7d6b1ddd
--- /dev/null
+++ b/mysql-test/t/innodb_bug35220.test
@@ -0,0 +1,16 @@
+#
+# Bug#35220 ALTER TABLE too picky on reserved word "foreign"
+# 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
+-- disable_query_log
+-- disable_result_log
+
+CREATE TABLE bug35220 (foreign_col INT, dummy_cant_delete_all_columns INT);
+ALTER TABLE bug35220 DROP foreign_col;
+DROP TABLE bug35220;
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index 7522de6ff0c..a9a5ef6fdae 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -3300,4 +3300,16 @@ SELECT * FROM t2 WHERE b NOT IN (SELECT max(t.c) FROM t1, t1 t WHERE t.c>10);
 
 DROP TABLE t1,t2;
 
---echo End of 5.0 tests.
+#
+# Bug #38191: Server crash with subquery containing DISTINCT and ORDER BY
+#
+
+CREATE TABLE t1(pk int PRIMARY KEY, a int, INDEX idx(a));
+INSERT INTO t1 VALUES (1, 10), (3, 30), (2, 20);
+CREATE TABLE t2(pk int PRIMARY KEY, a int, b int, INDEX idxa(a));
+INSERT INTO t2 VALUES (2, 20, 700), (1, 10, 200), (4, 10, 100);
+SELECT * FROM t1
+   WHERE EXISTS (SELECT DISTINCT a FROM t2 WHERE t1.a < t2.a ORDER BY b);
+DROP TABLE t1,t2;
+
+--echo End of 5.1 tests.