innodb tests 563

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)

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

mysql-test/suite/innodb/t/blob_page_reserve.opt

---innodb-sys-tablestats
\ No newline at end of file
+--innodb-sys-tablestats
+--innodb_page_size=16k
\ No newline at end of file

mysql-test/suite/innodb/t/create-index-debug.opt

+--innodb_page_size=16384 

mysql-test/suite/innodb/t/file_format_upgrade_16k.opt

+--innodb_page_size=16k

mysql-test/suite/innodb/t/index_merge_threshold.opt

 --loose-innodb_sys_tablespaces
+--innodb_page_size=16k
\ No newline at end of file

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 #

mysql-test/suite/innodb/t/innodb-16k-master.opt

 --default_storage_engine=InnoDB
+--innodb_page_size=16k

mysql-test/suite/innodb/t/innodb-wl5980-windows-master.opt

 --innodb-undo-tablespaces=0
+--innodb_page_size=16k

mysql-test/suite/innodb/t/innodb_blob_truncate.opt

+--innodb_page_size=16k

mysql-test/suite/innodb/t/innodb_buffer_pool_dump_pct.opt

+--innodb_page_size=16k

mysql-test/suite/innodb/t/innodb_defragment_fill_factor.opt

 --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

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;
 
 

mysql-test/suite/innodb/t/log_corruption.opt

+--innodb_page_size=16k

mysql-test/suite/innodb/t/page_reorganize.opt

+--innodb_page_size=16384 

mysql-test/suite/innodb/t/redo_log_during_checkpoint.opt

+--innodb_page_size=16384