innodb tests 563mdev-13626

16 files changed, 14 insertions, 9 deletions

diff --git a/mysql-test/suite/innodb/disabled.def b/mysql-test/suite/innodb/disabled.def
index ad5f34cfee1..c0cb8ac1d16 100644
--- a/mysql-test/suite/innodb/disabled.def
+++ b/mysql-test/suite/innodb/disabled.def
@@ -74,7 +74,6 @@ innodb_rename_index_err: mdev-13626 (a)
 innodb_replace: mdev-13626 (a)
 innodb_stats_sample_pages: mdev-13626 (a)
 innodb_wl6469_1: mdev-13626 (a)
-innodb_wl6560_1: mdev-13626 (a)
 innodb_wl6560_debug: mdev-13626 (a)
 innodb_wl6915_debug: mdev-13626 (a)
 log_file_size_checkpoint: mdev-13626 (a)
diff --git a/mysql-test/suite/innodb/r/innodb_wl6560_1.result b/mysql-test/suite/innodb/r/innodb_wl6560_1.result
index 2824ed75f82..95aed29eadc 100644
--- a/mysql-test/suite/innodb/r/innodb_wl6560_1.result
+++ b/mysql-test/suite/innodb/r/innodb_wl6560_1.result
@@ -129,7 +129,6 @@ SELECT * FROM t3,t4;
 a	RIGHT(t1.c,10)	RIGHT(t2.c,10)	a	RIGHT(t1.c,10)	RIGHT(t2.c,10)
 UNLOCK TABLES;
 ibtmp1
-t4.ibd
 DROP TABLE t1,t2,t3,t4;
 SELECT @@global.innodb_file_per_table;
 @@global.innodb_file_per_table
diff --git a/mysql-test/suite/innodb/t/blob_page_reserve.opt b/mysql-test/suite/innodb/t/blob_page_reserve.opt
index c2c176bbc6e..b499431c79b 100644
--- a/mysql-test/suite/innodb/t/blob_page_reserve.opt
+++ b/mysql-test/suite/innodb/t/blob_page_reserve.opt
@@ -1 +1,2 @@
---innodb-sys-tablestats
\ No newline at end of file
+--innodb-sys-tablestats
+--innodb_page_size=16k
\ No newline at end of file
diff --git a/mysql-test/suite/innodb/t/create-index-debug.opt b/mysql-test/suite/innodb/t/create-index-debug.opt
new file mode 100644
index 00000000000..c8c9496d121
--- /dev/null
+++ b/mysql-test/suite/innodb/t/create-index-debug.opt
@@ -0,0 +1 @@
+--innodb_page_size=16384 
diff --git a/mysql-test/suite/innodb/t/file_format_upgrade_16k.opt b/mysql-test/suite/innodb/t/file_format_upgrade_16k.opt
new file mode 100644
index 00000000000..130350d7b7e
--- /dev/null
+++ b/mysql-test/suite/innodb/t/file_format_upgrade_16k.opt
@@ -0,0 +1 @@
+--innodb_page_size=16k
diff --git a/mysql-test/suite/innodb/t/index_merge_threshold.opt b/mysql-test/suite/innodb/t/index_merge_threshold.opt
index 56434e883de..237607f8a51 100644
--- a/mysql-test/suite/innodb/t/index_merge_threshold.opt
+++ b/mysql-test/suite/innodb/t/index_merge_threshold.opt
@@ -1 +1,2 @@
 --loose-innodb_sys_tablespaces
+--innodb_page_size=16k
\ No newline at end of file
diff --git a/mysql-test/suite/innodb/t/index_merge_threshold.test b/mysql-test/suite/innodb/t/index_merge_threshold.test
index a587e10db6c..a0ab5a53e29 100644
--- a/mysql-test/suite/innodb/t/index_merge_threshold.test
+++ b/mysql-test/suite/innodb/t/index_merge_threshold.test
@@ -62,8 +62,6 @@ WHERE t.TABLE_ID = i.TABLE_ID AND t.NAME = 'test/tab';
 # Cleanup
 DROP TABLE tab;
 
-
-
 --echo #
 --echo # behavior for deleting records
 --echo #
@@ -105,8 +103,6 @@ PARTITION BY RANGE (a)
 
 DROP TABLE tab1;
 
-
-
 --echo #
 --echo # behavior for updating to smaller records
 --echo #
diff --git a/mysql-test/suite/innodb/t/innodb-16k-master.opt b/mysql-test/suite/innodb/t/innodb-16k-master.opt
index a99075f5329..4e2021b764a 100644
--- a/mysql-test/suite/innodb/t/innodb-16k-master.opt
+++ b/mysql-test/suite/innodb/t/innodb-16k-master.opt
@@ -1 +1,2 @@
 --default_storage_engine=InnoDB
+--innodb_page_size=16k
diff --git a/mysql-test/suite/innodb/t/innodb-wl5980-windows-master.opt b/mysql-test/suite/innodb/t/innodb-wl5980-windows-master.opt
index 2799511ab3c..6448059a2e6 100644
--- a/mysql-test/suite/innodb/t/innodb-wl5980-windows-master.opt
+++ b/mysql-test/suite/innodb/t/innodb-wl5980-windows-master.opt
@@ -1 +1,2 @@
 --innodb-undo-tablespaces=0
+--innodb_page_size=16k
diff --git a/mysql-test/suite/innodb/t/innodb_blob_truncate.opt b/mysql-test/suite/innodb/t/innodb_blob_truncate.opt
new file mode 100644
index 00000000000..130350d7b7e
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb_blob_truncate.opt
@@ -0,0 +1 @@
+--innodb_page_size=16k
diff --git a/mysql-test/suite/innodb/t/innodb_buffer_pool_dump_pct.opt b/mysql-test/suite/innodb/t/innodb_buffer_pool_dump_pct.opt
new file mode 100644
index 00000000000..130350d7b7e
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb_buffer_pool_dump_pct.opt
@@ -0,0 +1 @@
+--innodb_page_size=16k
diff --git a/mysql-test/suite/innodb/t/innodb_defragment_fill_factor.opt b/mysql-test/suite/innodb/t/innodb_defragment_fill_factor.opt
index 6426bac41a0..cfadc1dba46 100644
--- a/mysql-test/suite/innodb/t/innodb_defragment_fill_factor.opt
+++ b/mysql-test/suite/innodb/t/innodb_defragment_fill_factor.opt
@@ -1,4 +1,5 @@
 --loose-innodb-buffer-pool-stats
 --loose-innodb-buffer-page
 --loose-innodb-buffer-page-lru
---innodb-defragment=1
\ No newline at end of file
+--innodb-defragment=1
+--innodb_page_size=16k
diff --git a/mysql-test/suite/innodb/t/innodb_wl6560_1.test b/mysql-test/suite/innodb/t/innodb_wl6560_1.test
index 3a6503d4b0a..31a5eead7ab 100644
--- a/mysql-test/suite/innodb/t/innodb_wl6560_1.test
+++ b/mysql-test/suite/innodb/t/innodb_wl6560_1.test
@@ -284,7 +284,6 @@ SELECT * FROM t3,t4;
 UNLOCK TABLES;
 
 --list_files $MYSQL_DATA_DIR/ ibtmp1*
---list_files $MYSQL_DATA_DIR/test/ t4*ibd*
 DROP TABLE t1,t2,t3,t4;
 
 
diff --git a/mysql-test/suite/innodb/t/log_corruption.opt b/mysql-test/suite/innodb/t/log_corruption.opt
new file mode 100644
index 00000000000..130350d7b7e
--- /dev/null
+++ b/mysql-test/suite/innodb/t/log_corruption.opt
@@ -0,0 +1 @@
+--innodb_page_size=16k
diff --git a/mysql-test/suite/innodb/t/page_reorganize.opt b/mysql-test/suite/innodb/t/page_reorganize.opt
new file mode 100644
index 00000000000..c8c9496d121
--- /dev/null
+++ b/mysql-test/suite/innodb/t/page_reorganize.opt
@@ -0,0 +1 @@
+--innodb_page_size=16384 
diff --git a/mysql-test/suite/innodb/t/redo_log_during_checkpoint.opt b/mysql-test/suite/innodb/t/redo_log_during_checkpoint.opt
new file mode 100644
index 00000000000..c8c9496d121
--- /dev/null
+++ b/mysql-test/suite/innodb/t/redo_log_during_checkpoint.opt
@@ -0,0 +1 @@
+--innodb_page_size=16384