after merge: remove innodb_file_format from merged tests

mysql-test/suite/innodb/r/innodb_max_recordsize_32k.result

@@ -2,12 +2,8 @@ call mtr.add_suppression('InnoDB: Cannot add field.*because after adding it, the
 SELECT @@innodb_page_size;
 @@innodb_page_size
 32768
-SET GLOBAL innodb_file_format='Barracuda';
 SET GLOBAL innodb_file_per_table=ON;
 SET @@innodb_strict_mode=ON;
-SELECT @@innodb_file_format;
-@@innodb_file_format
-Barracuda
 SELECT @@innodb_file_per_table;
 @@innodb_file_per_table
 1

mysql-test/suite/innodb/r/innodb_max_recordsize_64k.result

@@ -2,12 +2,8 @@ call mtr.add_suppression('InnoDB: Cannot add field.*because after adding it, the
 SELECT @@innodb_page_size;
 @@innodb_page_size
 65536
-SET GLOBAL innodb_file_format='Barracuda';
 SET GLOBAL innodb_file_per_table=ON;
 SET @@innodb_strict_mode=ON;
-SELECT @@innodb_file_format;
-@@innodb_file_format
-Barracuda
 SELECT @@innodb_file_per_table;
 @@innodb_file_per_table
 1

mysql-test/suite/innodb/t/innodb-enlarge-blob.opt

 --innodb-file-per-table
---innodb-file-format='Barracuda'
 --innodb-buffer-pool-size=32M
 --innodb-log-file-size=32M
 --innodb-strict-mode=OFF

mysql-test/suite/innodb/t/innodb_max_recordsize_32k.test

@@ -7,16 +7,13 @@ call mtr.add_suppression('InnoDB: Cannot add field.*because after adding it, the
 SELECT @@innodb_page_size;
 
 let $innodb_file_per_table = `SELECT @@innodb_file_per_table`;
-let $innodb_file_format = `SELECT @@innodb_file_format`;
 let $innodb_strict_mode = `SELECT @@innodb_strict_mode`;
 
 --disable_warnings
-SET GLOBAL innodb_file_format='Barracuda';
 SET GLOBAL innodb_file_per_table=ON;
 SET @@innodb_strict_mode=ON;
 --enable_warnings
 
-SELECT @@innodb_file_format;
 SELECT @@innodb_file_per_table;
 SELECT @@innodb_strict_mode;
 
@@ -393,7 +390,6 @@ DROP TABLE t;
 # cleanup
 --disable_query_log
 --disable_warnings
-eval SET GLOBAL INNODB_FILE_FORMAT=$innodb_file_format;
 eval SET GLOBAL INNODB_FILE_PER_TABLE=$innodb_file_per_table;
 eval SET GLOBAL INNODB_STRICT_MODE=$innodb_strict_mode;
 --enable_warnings

mysql-test/suite/innodb/t/innodb_max_recordsize_64k.test

@@ -7,16 +7,13 @@ call mtr.add_suppression('InnoDB: Cannot add field.*because after adding it, the
 SELECT @@innodb_page_size;
 
 let $innodb_file_per_table = `SELECT @@innodb_file_per_table`;
-let $innodb_file_format = `SELECT @@innodb_file_format`;
 let $innodb_strict_mode = `SELECT @@innodb_strict_mode`;
 
 --disable_warnings
-SET GLOBAL innodb_file_format='Barracuda';
 SET GLOBAL innodb_file_per_table=ON;
 SET @@innodb_strict_mode=ON;
 --enable_warnings
 
-SELECT @@innodb_file_format;
 SELECT @@innodb_file_per_table;
 SELECT @@innodb_strict_mode;
 
@@ -597,7 +594,6 @@ DROP TABLE t;
 # cleanup
 --disable_query_log
 --disable_warnings
-eval SET GLOBAL INNODB_FILE_FORMAT=$innodb_file_format;
 eval SET GLOBAL INNODB_FILE_PER_TABLE=$innodb_file_per_table;
 eval SET GLOBAL INNODB_STRICT_MODE=$innodb_strict_mode;
 --enable_warnings

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

 --skip-innodb-doublewrite
 --innodb-file-per-table
---innodb-file-format=Barracuda
-

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

 --skip-innodb-doublewrite
 --innodb-file-per-table
---innodb-file-format=Barracuda
 --innodb-change-buffering=none

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

 --innodb-file-per-table
---innodb-file-format=Barracuda