Remove references to innodb_file_format.

innodb_file_format=Barracuda is the default in MariaDB 10.2.
Do not set it, because the option will be removed in MariaDB 10.3.

Also, do not set innodb_file_per_table=1 because it is the default.

Note that MDEV-11828 should fix the test innodb.innodb-64k
already in 10.1.

22 files changed, 42 insertions, 360 deletions

diff --git a/mysql-test/suite/innodb/t/innochecksum.opt b/mysql-test/suite/innodb/t/innochecksum.opt
deleted file mode 100644
index cc738d97434..00000000000
--- a/mysql-test/suite/innodb/t/innochecksum.opt
+++ /dev/null
@@ -1,2 +0,0 @@
---innodb_file_per_table=1
---innodb_file_format=Barracuda
diff --git a/mysql-test/suite/innodb/t/innodb-16k.test b/mysql-test/suite/innodb/t/innodb-16k.test
index ad09666442d..a771fac27ed 100644
--- a/mysql-test/suite/innodb/t/innodb-16k.test
+++ b/mysql-test/suite/innodb/t/innodb-16k.test
@@ -8,17 +8,11 @@ call mtr.add_suppression("InnoDB: Cannot add field .* in table .* because after
 --disable_query_log
 let $MYSQLD_DATADIR= `select @@datadir`;
 # These values can change during the test
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
-let $innodb_strict_mode_orig = `SELECT @@session.innodb_strict_mode`;
 let $innodb_large_prefix_orig = `SELECT @@innodb_large_prefix`;
 --enable_query_log
 
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 SET GLOBAL innodb_large_prefix = OFF;
 
-
 --echo # Test 1) Show the page size from Information Schema
 SELECT variable_value FROM information_schema.global_status
        WHERE LOWER(variable_name) = 'innodb_page_size';
@@ -263,8 +257,6 @@ SELECT table_name, row_format, create_options
 
 DROP TABLE t1;
 
-SET GLOBAL innodb_file_format = `Barracuda`;
-
 CREATE TABLE t2(d varchar(17) PRIMARY KEY) ENGINE=innodb DEFAULT CHARSET=utf8;
 CREATE TABLE t3(a int PRIMARY KEY) ENGINE=innodb;
 INSERT INTO t3 VALUES (22),(44),(33),(55),(66);
@@ -381,9 +373,6 @@ UPDATE t1 SET t=@e;
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
 
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
-
 --echo Test an assertion failure on purge.
 
 # This test is not in innodb_8k or innodb_4k since the bug is not about
@@ -440,8 +429,6 @@ DELETE FROM t3_purge;
 DELETE FROM t4_purge;
 
 # A secondary index tuple is found to be too long to fit into a page.
-SET GLOBAL innodb_file_per_table=on;
-SET GLOBAL innodb_file_format='Barracuda';
 SET @r=REPEAT('a',500);
 
 CREATE TABLE tlong(a int,
@@ -961,8 +948,5 @@ row_format=compact,ENGINE=INNODB;
 #
 
 --disable_query_log
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET SESSION innodb_strict_mode = $innodb_strict_mode_orig;
 EVAL SET GLOBAL innodb_large_prefix = $innodb_large_prefix_orig;
 --enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-32k-crash.test b/mysql-test/suite/innodb/t/innodb-32k-crash.test
index 8f2e7d6c1e2..b9d96fd92c8 100644
--- a/mysql-test/suite/innodb/t/innodb-32k-crash.test
+++ b/mysql-test/suite/innodb/t/innodb-32k-crash.test
@@ -10,16 +10,7 @@
 
 call mtr.add_suppression("InnoDB: Warning: innodb_page_size has been changed from default value *");
 
---disable_query_log
 let $MYSQLD_DATADIR= `select @@datadir`;
-# These values can change during the test
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
-let $innodb_strict_mode_orig = `SELECT @@session.innodb_strict_mode`;
---enable_query_log
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 
 CREATE TABLE t1(a blob,b blob,c blob,d blob,e blob,f blob,g blob,
                 h blob,i blob,j blob,k blob,l blob,m blob,n blob,
@@ -210,13 +201,3 @@ COMMIT;
 show create table t1;
 show create table t2;
 drop table t1,t2;
-
-#
-# restore environment to the state it was before this test execution
-#
-
---disable_query_log
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET SESSION innodb_strict_mode = $innodb_strict_mode_orig;
---enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-32k.test b/mysql-test/suite/innodb/t/innodb-32k.test
index 65c1d4bbc76..53a2d3a7442 100644
--- a/mysql-test/suite/innodb/t/innodb-32k.test
+++ b/mysql-test/suite/innodb/t/innodb-32k.test
@@ -3,21 +3,13 @@
 --source include/have_innodb.inc
 --source include/have_innodb_32k.inc
 
-call mtr.add_suppression("InnoDB: Warning: innodb_page_size has been changed from default value *");
-call mtr.add_suppression("InnoDB: Resizing redo log from *");
-call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files.");
-call mtr.add_suppression("InnoDB: New log files created, LSN=*");
+call mtr.add_suppression("InnoDB: Warning: innodb_page_size has been changed from default value ");
+call mtr.add_suppression("InnoDB: Resizing redo log from ");
+call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files");
+call mtr.add_suppression("InnoDB: New log files created, LSN=");
+call mtr.add_suppression("Innodb: Cannot add field.*row size is");
 
---disable_query_log
 let $MYSQLD_DATADIR= `select @@datadir`;
-# These values can change during the test
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
-let $innodb_strict_mode_orig = `SELECT @@session.innodb_strict_mode`;
---enable_query_log
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 
 --echo # Test 1) Show the page size from Information Schema
 SELECT variable_value FROM information_schema.global_status
@@ -347,9 +339,9 @@ CREATE INDEX tn1f9 ON t1 (oa(767));
 CREATE INDEX to1f11 ON t1 (pa(767));
 UPDATE t1 SET t=@e;
 
-# One more index and row size is too big
---replace_regex /> [0-9]*/> max_row_size/
---error ER_TOO_BIG_ROWSIZE
+# One more index and row size is too big (not any more!)
+#--replace_regex /> [0-9]*/> max_row_size/
+#--error ER_TOO_BIG_ROWSIZE
 CREATE INDEX t1f6 ON t1 (l(767));
 
 drop table t1;
@@ -410,8 +402,6 @@ DELETE FROM t3_purge;
 DELETE FROM t4_purge;
 
 # A secondary index tuple is found to be too long to fit into a page.
-SET GLOBAL innodb_file_per_table=on;
-SET GLOBAL innodb_file_format='Barracuda';
 SET @r=REPEAT('a',500);
 
 CREATE TABLE tlong(a int,
@@ -758,12 +748,3 @@ show create table t2;
 update t2 set col150=@a;
 update t2 set col145=@b;
 drop table t2;
-#
-# restore environment to the state it was before this test execution
-#
-
---disable_query_log
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET SESSION innodb_strict_mode = $innodb_strict_mode_orig;
---enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-64k-crash.test b/mysql-test/suite/innodb/t/innodb-64k-crash.test
index 9d2d0d66415..b61396bf22c 100644
--- a/mysql-test/suite/innodb/t/innodb-64k-crash.test
+++ b/mysql-test/suite/innodb/t/innodb-64k-crash.test
@@ -10,16 +10,7 @@
 
 call mtr.add_suppression("InnoDB: Warning: innodb_page_size has been changed from default value *");
 
---disable_query_log
 let $MYSQLD_DATADIR= `select @@datadir`;
-# These values can change during the test
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
-let $innodb_strict_mode_orig = `SELECT @@session.innodb_strict_mode`;
---enable_query_log
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 
 CREATE TABLE t1(a blob,b blob,c blob,d blob,e blob,f blob,g blob,
                 h blob,i blob,j blob,k blob,l blob,m blob,n blob,
@@ -400,13 +391,3 @@ COMMIT;
 show create table t1;
 show create table t2;
 drop table t1,t2;
-
-#
-# restore environment to the state it was before this test execution
-#
-
---disable_query_log
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET SESSION innodb_strict_mode = $innodb_strict_mode_orig;
---enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-64k.test b/mysql-test/suite/innodb/t/innodb-64k.test
index bd0da6b66ad..c611b6cb2e2 100644
--- a/mysql-test/suite/innodb/t/innodb-64k.test
+++ b/mysql-test/suite/innodb/t/innodb-64k.test
@@ -1,5 +1,5 @@
 --source include/no_valgrind_without_big.inc
-# Tests for setting innodb-page-size=64k; 
+# Tests for setting innodb-page-size=64k;
 --source include/have_innodb.inc
 --source include/have_innodb_64k.inc
 
@@ -8,16 +8,7 @@ call mtr.add_suppression("InnoDB: Resizing redo log from *");
 call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files.");
 call mtr.add_suppression("InnoDB: New log files created, LSN=*");
 
---disable_query_log
 let $MYSQLD_DATADIR= `select @@datadir`;
-# These values can change during the test
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
-let $innodb_strict_mode_orig = `SELECT @@session.innodb_strict_mode`;
---enable_query_log
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 
 --echo # Test 1) Show the page size from Information Schema
 SELECT variable_value FROM information_schema.global_status
@@ -29,6 +20,7 @@ SET SESSION innodb_strict_mode = ON;
 
 # Redundant table; 32698 bytes
 
+# MDEV-11828 FIXME: The length must be less!
 CREATE TABLE t1 (
 c01 char(200), c02 char(200), c03 char(200), c04 char(200), c05 char(200),
 c06 char(200), c07 char(200), c08 char(200), c09 char(200), c10 char(200),
@@ -432,9 +424,9 @@ CREATE INDEX xtc1c5 ON t1 (cc(767),dc(767));
 CREATE INDEX xte1e5 ON t1 (ec(767),fc(767));
 UPDATE t1 SET t=@e;
 
-# One more index and row size is too big
---replace_regex /> [0-9]*/> max_row_size/
---error ER_TOO_BIG_ROWSIZE
+# One more index and row size is too big (not any more!)
+#--replace_regex /> [0-9]*/> max_row_size/
+#--error ER_TOO_BIG_ROWSIZE
 CREATE INDEX xt5k1f6 ON t1 (lc(767),mc(767));
 SHOW CREATE TABLE t1;
 SHOW WARNINGS;
@@ -712,12 +704,3 @@ COMMIT;
 
 drop table t2;
 DROP TABLE t1;
-#
-# restore environment to the state it was before this test execution
-#
-
---disable_query_log
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET SESSION innodb_strict_mode = $innodb_strict_mode_orig;
---enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-bug-14068765.test b/mysql-test/suite/innodb/t/innodb-bug-14068765.test
index 185e8849e21..c2446e0fecf 100644
--- a/mysql-test/suite/innodb/t/innodb-bug-14068765.test
+++ b/mysql-test/suite/innodb/t/innodb-bug-14068765.test
@@ -1,17 +1,6 @@
 -- source include/have_innodb.inc
---disable_warnings
 
-DROP TABLE IF EXISTS t1;
---enable_warnings
 let MYSQLD_DATADIR =`SELECT @@datadir`;
-let $innodb_file_per_table = `SELECT @@innodb_file_per_table`;
-let $innodb_file_format = `SELECT @@innodb_file_format`;
-
-SET GLOBAL innodb_file_per_table = 1;
-SELECT @@innodb_file_per_table;
-
-#SET GLOBAL innodb_file_format = `Barracuda`;
-#SELECT @@innodb_file_format;
 
 # Export/import on the same instance, with --innodb-file-per-table=1
 CREATE DATABASE testdb_wl5522;
@@ -68,6 +57,3 @@ SELECT COUNT(*) FROM testdb_wl5522.t1;
 DROP TABLE testdb_wl5522.t1;
 
 DROP DATABASE testdb_wl5522;
-
-eval SET GLOBAL INNODB_FILE_FORMAT=$innodb_file_format;
-eval SET GLOBAL INNODB_FILE_PER_TABLE=$innodb_file_per_table;
diff --git a/mysql-test/suite/innodb/t/innodb-bug-14084530.test b/mysql-test/suite/innodb/t/innodb-bug-14084530.test
index 94a2d6b2252..f27fbbe31d7 100644
--- a/mysql-test/suite/innodb/t/innodb-bug-14084530.test
+++ b/mysql-test/suite/innodb/t/innodb-bug-14084530.test
@@ -1,15 +1,6 @@
 -- source include/have_innodb.inc
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
 let MYSQLD_DATADIR =`SELECT @@datadir`;
-let $innodb_file_per_table = `SELECT @@innodb_file_per_table`;
-let $innodb_file_format = `SELECT @@innodb_file_format`;
-
-SET GLOBAL innodb_file_per_table = 1;
-SELECT @@innodb_file_per_table;
 
 SET AUTOCOMMIT = 0;
 
@@ -45,8 +36,4 @@ ALTER TABLE testdb_wl5522.t1 IMPORT TABLESPACE;
 CHECK TABLE testdb_wl5522.t1;
 SELECT c1 FROM testdb_wl5522.t1;
 
-SET AUTOCOMMIT = 1;
-DROP TABLE testdb_wl5522.t1;
 DROP DATABASE testdb_wl5522;
-eval SET GLOBAL INNODB_FILE_FORMAT=$innodb_file_format;
-eval SET GLOBAL INNODB_FILE_PER_TABLE=$innodb_file_per_table;
diff --git a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test
index 8598647de66..4549b3b6b47 100644
--- a/mysql-test/suite/innodb/t/innodb-index.test
+++ b/mysql-test/suite/innodb/t/innodb-index.test
@@ -1,15 +1,7 @@
 -- source include/have_innodb.inc
 
-let $innodb_file_format_orig=`select @@innodb_file_format`;
-let $innodb_file_format_max_orig=`select @@innodb_file_format_max`;
-
 let $MYSQLD_DATADIR= `select @@datadir`;
 
-let $per_table=`select @@innodb_file_per_table`;
-let $format=`select @@innodb_file_format`;
-set global innodb_file_per_table=on;
-set global innodb_file_format='Barracuda';
-
 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS;
 
 # Bug#13654923 BOGUS DEBUG ASSERTION IN INDEX CREATION FOR ZERO-LENGTH RECORD
@@ -336,10 +328,6 @@ explain select * from t1;
 explain select * from t1 order by a;
 drop table t1;
 
-eval set global innodb_file_per_table=$per_table;
-eval set global innodb_file_format=$format;
-eval set global innodb_file_format_max=$format;
-
 #
 # Test to check whether CREATE INDEX handles implicit foreign key
 # constraint modifications (Issue #70, Bug #38786)
@@ -558,8 +546,3 @@ show create table t2c;
 --disable_info
 
 DROP TABLE t1,t2,t2c,t2i;
-
---disable_query_log
-eval SET GLOBAL innodb_file_format=$innodb_file_format_orig;
-eval SET GLOBAL innodb_file_format_max=$innodb_file_format_max_orig;
---enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_bzip2.test b/mysql-test/suite/innodb/t/innodb-page_compression_bzip2.test
index 51493266a60..69a632d6010 100644
--- a/mysql-test/suite/innodb/t/innodb-page_compression_bzip2.test
+++ b/mysql-test/suite/innodb/t/innodb-page_compression_bzip2.test
@@ -2,14 +2,7 @@
 -- source include/have_innodb_bzip2.inc
 -- source include/not_embedded.inc
 
---disable_query_log
 let $innodb_compression_algorithm_orig=`select @@innodb_compression_algorithm`;
-let $innodb_file_format_orig = `select @@innodb_file_format`;
-let $innodb_file_per_table_orig = `select @@innodb_file_per_table`;
---enable_query_log
-
-set global innodb_file_format = `barracuda`;
-set global innodb_file_per_table = on;
 
 # bzip2
 set global innodb_compression_algorithm = 5;
@@ -247,6 +240,4 @@ drop table innodb_page_compressed9;
 # reset system
 --disable_query_log
 EVAL SET GLOBAL innodb_compression_algorithm = $innodb_compression_algorithm_orig;
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
 --enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_lz4.test b/mysql-test/suite/innodb/t/innodb-page_compression_lz4.test
index f36ea9684e9..1b1df674e3c 100644
--- a/mysql-test/suite/innodb/t/innodb-page_compression_lz4.test
+++ b/mysql-test/suite/innodb/t/innodb-page_compression_lz4.test
@@ -2,14 +2,7 @@
 -- source include/have_innodb_lz4.inc
 -- source include/not_embedded.inc
 
---disable_query_log
 let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
---enable_query_log
-
-set global innodb_file_format = `barracuda`;
-set global innodb_file_per_table = on;
 
 # lz4
 set global innodb_compression_algorithm = 2;
@@ -248,6 +241,4 @@ drop table innodb_page_compressed9;
 # reset system
 --disable_query_log
 EVAL SET GLOBAL innodb_compression_algorithm = $innodb_compression_algorithm_orig;
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
 --enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_lzma.test b/mysql-test/suite/innodb/t/innodb-page_compression_lzma.test
index 6ea686bca04..9cec3e7a947 100644
--- a/mysql-test/suite/innodb/t/innodb-page_compression_lzma.test
+++ b/mysql-test/suite/innodb/t/innodb-page_compression_lzma.test
@@ -2,14 +2,7 @@
 -- source include/have_innodb_lzma.inc
 -- source include/not_embedded.inc
 
---disable_query_log
 let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
---enable_query_log
-
-set global innodb_file_format = `barracuda`;
-set global innodb_file_per_table = on;
 
 # lzma
 set global innodb_compression_algorithm = 4;
@@ -247,6 +240,4 @@ drop table innodb_page_compressed9;
 # reset system
 --disable_query_log
 EVAL SET GLOBAL innodb_compression_algorithm = $innodb_compression_algorithm_orig;
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
 --enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_lzo.test b/mysql-test/suite/innodb/t/innodb-page_compression_lzo.test
index 96ba18f5112..65c7e5dd3d9 100644
--- a/mysql-test/suite/innodb/t/innodb-page_compression_lzo.test
+++ b/mysql-test/suite/innodb/t/innodb-page_compression_lzo.test
@@ -2,15 +2,7 @@
 -- source include/have_innodb_lzo.inc
 -- source include/not_embedded.inc
 
-
---disable_query_log
 let $innodb_compression_algorithm_orig=`select @@innodb_compression_algorithm`;
-let $innodb_file_format_orig = `select @@innodb_file_format`;
-let $innodb_file_per_table_orig = `select @@innodb_file_per_table`;
---enable_query_log
-
-set global innodb_file_format = `barracuda`;
-set global innodb_file_per_table = on;
 
 # lzo
 set global innodb_compression_algorithm = 3;
@@ -201,6 +193,4 @@ drop table innodb_page_compressed9;
 # reset system
 --disable_query_log
 eval set global innodb_compression_algorithm = $innodb_compression_algorithm_orig;
-eval set global innodb_file_per_table = $innodb_file_per_table_orig;
-eval set global innodb_file_format = $innodb_file_format_orig;
 --enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_snappy.test b/mysql-test/suite/innodb/t/innodb-page_compression_snappy.test
index 929f547b6ac..65b626f786d 100644
--- a/mysql-test/suite/innodb/t/innodb-page_compression_snappy.test
+++ b/mysql-test/suite/innodb/t/innodb-page_compression_snappy.test
@@ -3,14 +3,7 @@
 
 call mtr.add_suppression("Compression failed for space*");
 
---disable_query_log
 let $innodb_compression_algorithm_orig=`select @@innodb_compression_algorithm`;
-let $innodb_file_format_orig = `select @@innodb_file_format`;
-let $innodb_file_per_table_orig = `select @@innodb_file_per_table`;
---enable_query_log
-
-set global innodb_file_format = `barracuda`;
-set global innodb_file_per_table = on;
 
 # snappy
 set global innodb_compression_algorithm = 6;
@@ -248,6 +241,4 @@ drop table innodb_page_compressed9;
 # reset system
 --disable_query_log
 EVAL SET GLOBAL innodb_compression_algorithm = $innodb_compression_algorithm_orig;
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
 --enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_tables.test b/mysql-test/suite/innodb/t/innodb-page_compression_tables.test
index 3a241810bbc..be8300b39aa 100644
--- a/mysql-test/suite/innodb/t/innodb-page_compression_tables.test
+++ b/mysql-test/suite/innodb/t/innodb-page_compression_tables.test
@@ -1,14 +1,8 @@
 --source include/have_innodb.inc
 --source include/not_embedded.inc
 
---disable_query_log
 let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
---enable_query_log
 
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 # zlib
 set global innodb_compression_algorithm = 1;
 
@@ -75,8 +69,6 @@ update innodb_dynamic set c1 = c1 + 1;
 select count(*) from innodb_compact where c1 < 1500000;
 select count(*) from innodb_dynamic where c1 < 1500000;
 
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 # none
 set global innodb_compression_algorithm = 0;
 
@@ -112,6 +104,4 @@ SET SESSION innodb_compression_default = 0;
 # reset system
 --disable_query_log
 EVAL SET GLOBAL innodb_compression_algorithm = $innodb_compression_algorithm_orig;
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
 --enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_zip.test b/mysql-test/suite/innodb/t/innodb-page_compression_zip.test
index 67fafdb9e83..0c843314eee 100644
--- a/mysql-test/suite/innodb/t/innodb-page_compression_zip.test
+++ b/mysql-test/suite/innodb/t/innodb-page_compression_zip.test
@@ -1,14 +1,7 @@
 --source include/have_innodb.inc
 --source include/not_embedded.inc
 
---disable_query_log
 let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
---enable_query_log
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 
 # zlib
 set global innodb_compression_algorithm = 1;
@@ -198,6 +191,4 @@ drop table innodb_page_compressed9;
 # reset system
 --disable_query_log
 EVAL SET GLOBAL innodb_compression_algorithm = $innodb_compression_algorithm_orig;
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
 --enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-wl5522-1.test b/mysql-test/suite/innodb/t/innodb-wl5522-1.test
index 6c2607effe8..0d59df11c44 100644
--- a/mysql-test/suite/innodb/t/innodb-wl5522-1.test
+++ b/mysql-test/suite/innodb/t/innodb-wl5522-1.test
@@ -5,30 +5,15 @@
 
 call mtr.add_suppression("InnoDB: Unable to import tablespace .* because it already exists.  Please DISCARD the tablespace before IMPORT.");
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
 let MYSQLD_DATADIR =`SELECT @@datadir`;
-let $innodb_file_per_table = `SELECT @@innodb_file_per_table`;
-let $innodb_file_format = `SELECT @@innodb_file_format`;
-
-SET GLOBAL innodb_file_per_table = 1;
-SELECT @@innodb_file_per_table;
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SELECT @@innodb_file_format;
-
-let $MYSQLD_DATADIR = `SELECT @@datadir`;
 
 # Following testcases are created from JET cases (where import
 # export instance are differnt server )
 # Here test will be run on same import and export instance.
 
-DROP DATABASE IF EXISTS testdb_wl5522;
 CREATE DATABASE testdb_wl5522;
 
-# case 1 
+# case 1
 CREATE TABLE testdb_wl5522.t1 (c1 INT ) ENGINE = Innodb;
 INSERT INTO testdb_wl5522.t1 VALUES (1),(123),(331);
 SELECT c1 FROM testdb_wl5522.t1;
@@ -57,43 +42,43 @@ ALTER TABLE testdb_wl5522.t1 IMPORT TABLESPACE;
 SELECT * FROM testdb_wl5522.t1 ORDER BY c1;
 DROP TABLE testdb_wl5522.t1;
 
-# case 2 
+# case 2
 CREATE TABLE testdb_wl5522.t1 (
 col1 BIT(1),
 col2 BOOLEAN,
 col3 TINYINT,
-col4 SMALLINT, 
+col4 SMALLINT,
 col5 MEDIUMINT,
 col6 INT,
-col7 BIGINT, 
+col7 BIGINT,
 col8 FLOAT (14,3) ,
-col9 DOUBLE (14,3), 
-col10 VARCHAR(20), 
+col9 DOUBLE (14,3),
+col10 VARCHAR(20),
 col11 TEXT ,
 col12 ENUM('a','b','c'),
 col13 TEXT,
-col14 CHAR(20) , 
-col15 VARBINARY (400) , 
-col16 BINARY(40), 
-col17 BLOB (400) , 
+col14 CHAR(20),
+col15 VARBINARY (400),
+col16 BINARY(40),
+col17 BLOB (400),
 col18 INT NOT NULL PRIMARY KEY,
-col19 DATE ,
-col20 DATETIME , 
-col21 TIMESTAMP ,
-col22 TIME , 
+col19 DATE,
+col20 DATETIME,
+col21 TIMESTAMP,
+col22 TIME,
 col23 YEAR ) ENGINE = Innodb;
 
 CREATE INDEX idx1 ON testdb_wl5522.t1(col18);
 CREATE INDEX prefix_idx ON testdb_wl5522.t1(col14 (10));
 CREATE UNIQUE INDEX idx2 ON testdb_wl5522.t1(col12);
 CREATE UNIQUE INDEX idx3 ON testdb_wl5522.t1(col8);
-INSERT INTO testdb_wl5522.t1 VALUES 
+INSERT INTO testdb_wl5522.t1 VALUES
 (1,1,-128,32767,-8388608,2147483647,-9223372036854775808, 92233720368.222,
 -92233720368.222,'aaa', + 'aaaaaaaaaa','b','bbbbb','ccccc',
 REPEAT('d',40),REPEAT('d',40),REPEAT('d',40),1,'1000-01-01',
 '3000-12-31 23:59:59.99','1990-01-01 00:00:01.00',
 '01:59:59.00','1901');
-INSERT INTO testdb_wl5522.t1 VALUES 
+INSERT INTO testdb_wl5522.t1 VALUES
 (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
 NULL,NULL,NULL,3,NULL,NULL,NULL,NULL,NULL);
 --error 1048
@@ -136,7 +121,7 @@ col18 INT NOT NULL PRIMARY KEY,
 col19 DATE ,
 col20 DATETIME ,
 col21 TIMESTAMP ,
-col22 TIME , 
+col22 TIME,
 col23 YEAR ) ENGINE = Innodb;
 
 CREATE INDEX idx1 ON testdb_wl5522.t1(col18);
@@ -162,8 +147,6 @@ DROP TABLE testdb_wl5522.t1;
 
 # case 3 - with blob objects
 
-SET GLOBAL innodb_file_format='Barracuda';
-
 CREATE TABLE testdb_wl5522.t1 (
 col_1_varbinary VARBINARY (4000) ,
 col_2_varchar VARCHAR (4000),
@@ -178,13 +161,13 @@ INSERT INTO testdb_wl5522.t1 VALUES(
 REPEAT('a', 4000),REPEAT('o', 4000),REPEAT('a', 4000), REPEAT('o', 4000),
 REPEAT('a', 4000),REPEAT('a', 4000),REPEAT('a', 255));
 
-SELECT  col_1_varbinary = REPEAT("a", 4000) , 
+SELECT  col_1_varbinary = REPEAT("a", 4000),
 col_2_varchar = REPEAT("o", 4000) ,
 col_3_text = REPEAT("a", 4000) ,
 col_4_blob = REPEAT("o", 4000) ,
 col_5_text = REPEAT("a", 4000) ,
 col_6_varchar = REPEAT("a", 4000) ,
-col_7_binary = REPEAT("a", 255) 
+col_7_binary = REPEAT("a", 255)
 FROM testdb_wl5522.t1;
 FLUSH TABLES testdb_wl5522.t1 FOR EXPORT;
 
@@ -223,7 +206,7 @@ col_3_text = REPEAT("a", 4000) ,
 col_4_blob = REPEAT("o", 4000) ,
 col_5_text = REPEAT("a", 4000) ,
 col_6_varchar = REPEAT("a", 4000) ,
-col_7_binary = REPEAT("a", 255) 
+col_7_binary = REPEAT("a", 255)
 FROM testdb_wl5522.t1;
 
 DROP TABLE testdb_wl5522.t1;
@@ -231,7 +214,7 @@ DROP TABLE testdb_wl5522.t1;
 # case 4 - trasportable tablesace with autoincrement
 CREATE TABLE testdb_wl5522.t1 (
 col_1_int INT AUTO_INCREMENT,
-col_2_varchar VARCHAR (20), 
+col_2_varchar VARCHAR (20),
 PRIMARY KEY (col_1_int)) ENGINE = Innodb;
 
 INSERT INTO testdb_wl5522.t1 VALUES (1,'a1'),(2,'a2'),(3,'a3');
@@ -268,7 +251,7 @@ SELECT * FROM testdb_wl5522.t1 ORDER BY col_1_int;
 # error on inserting duplicate value
 --error 1062
 INSERT INTO testdb_wl5522.t1 VALUES (1,'a1');
-# insert new values 
+# insert new values
 INSERT INTO testdb_wl5522.t1(col_2_varchar) VALUES ('a101'),('a102'),('a103');
 SELECT * FROM testdb_wl5522.t1 ORDER BY col_1_int;
 # check table can be altered
@@ -284,7 +267,7 @@ PRIMARY KEY (col_2_varchar)) ENGINE = Innodb;
 
 CREATE TABLE testdb_wl5522.t1_fk (
 col_1_int INT,col_2_varchar VARCHAR (20),
-PRIMARY KEY (col_1_int), 
+PRIMARY KEY (col_1_int),
 FOREIGN KEY (col_2_varchar) REFERENCES testdb_wl5522.t1(col_2_varchar)
 ) ENGINE = Innodb;
 
@@ -452,7 +435,7 @@ UNLOCK TABLES;
 
 DROP TABLE testdb_wl5522.t1;
 
-# create table with incorrect schema 
+# create table with incorrect schema
 CREATE TABLE testdb_wl5522.t1 ( i bigint) ENGINE = Innodb;
 ALTER TABLE testdb_wl5522.t1 DISCARD TABLESPACE;
 
@@ -820,14 +803,14 @@ SET AUTOCOMMIT = 1;
 
 CREATE TABLE testdb_wl5522.t1(col1 bit(1) ,
 col2 boolean,col3 tinyint , col4 smallint ,
-col5 mediumint ,col6 int , col7 bigint , 
+col5 mediumint ,col6 int , col7 bigint ,
 col8 float (14,3) ,col9 double (14,3),
 col10 VARCHAR(20) CHARACTER SET utf8 ,
 col11 TEXT CHARACTER SET binary ,
 col12 ENUM('a','b','c') CHARACTER SET binary,
 col13 TEXT CHARACTER SET latin1 COLLATE latin1_general_cs ,
 col14 CHAR(20) , col15 VARBINARY (400),
-col16 BINARY(40), col17 BLOB (400), 
+col16 BINARY(40), col17 BLOB (400),
 col18 int not null primary key,
 col19 DATE ,col20 DATETIME , col21 TIMESTAMP ,
 col22 TIME , col23 YEAR ) ENGINE = Innodb;
@@ -835,7 +818,7 @@ col22 TIME , col23 YEAR ) ENGINE = Innodb;
 # table for trigger action
 CREATE TABLE testdb_wl5522.trigger_table ( i int ) ENGINE = Innodb;
 # define trigger
-CREATE  TRIGGER testdb_wl5522.tri AFTER INSERT ON  testdb_wl5522.t1 
+CREATE  TRIGGER testdb_wl5522.tri AFTER INSERT ON  testdb_wl5522.t1
 FOR EACH ROW INSERT INTO testdb_wl5522.trigger_table VALUES(NEW.col18);
 # define view
 CREATE OR REPLACE VIEW testdb_wl5522.VW1 AS SELECT * FROM testdb_wl5522.t1;
@@ -917,7 +900,7 @@ SELECT COUNT(*) FROM testdb_wl5522.t1;
 SELECT * FROM testdb_wl5522.trigger_table;
 SELECT COUNT(*) FROM testdb_wl5522.VW1;
 
-# trigger table is not updated as trigger got dropped 
+# trigger table is not updated as trigger got dropped
 INSERT INTO testdb_wl5522.t1(col18) VALUES (5);
 # validate data in table not updated
 SELECT * FROM testdb_wl5522.trigger_table;
@@ -949,6 +932,3 @@ call mtr.add_suppression("InnoDB: The table .* doesn't have a corresponding tabl
 --remove_file $MYSQLTEST_VARDIR/tmp/t1.ibd
 --remove_file $MYSQLTEST_VARDIR/tmp/t1_fk.cfg
 --remove_file $MYSQLTEST_VARDIR/tmp/t1_fk.ibd
-
-eval SET GLOBAL INNODB_FILE_FORMAT=$innodb_file_format;
-eval SET GLOBAL INNODB_FILE_PER_TABLE=$innodb_file_per_table;
diff --git a/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test b/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test
index 1f15c81b90b..3b71bd802ef 100644
--- a/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test
+++ b/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test
@@ -26,23 +26,10 @@ call mtr.add_suppression("InnoDB: Page for tablespace .* ");
 flush tables;
 
 let MYSQLD_DATADIR =`SELECT @@datadir`;
-let $innodb_file_per_table = `SELECT @@innodb_file_per_table`;
-let $innodb_file_format = `SELECT @@innodb_file_format`;
-let $innodb_strict_mode_orig=`select @@session.innodb_strict_mode`;
 let $pathfix=/: '.*test_wl5522.*t1.ibd'/: 'test_wl5522_t1.ibd'/;
 
-SET GLOBAL innodb_file_per_table = 1;
-SELECT @@innodb_file_per_table;
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SELECT @@innodb_file_format;
-
 SET SESSION innodb_strict_mode=1;
-SELECT @@SESSION.innodb_strict_mode;
-
-
 
-DROP DATABASE IF EXISTS test_wl5522;
 CREATE DATABASE test_wl5522;
 
 # Create the table that we will use for crash recovery (during IMPORT)
@@ -140,14 +127,7 @@ SET SESSION debug_dbug="-d,ib_import_before_checkpoint_crash";
 
 DROP TABLE test_wl5522.t1;
 
-SET GLOBAL innodb_file_per_table = 1;
-SELECT @@innodb_file_per_table;
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SELECT @@innodb_file_format;
-
 SET SESSION innodb_strict_mode=1;
-SELECT @@SESSION.innodb_strict_mode;
 
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb
 ROW_FORMAT=COMPRESSED;
@@ -755,7 +735,3 @@ call mtr.add_suppression("Could not find a valid tablespace file for 'test_wl552
 #cleanup
 --remove_file $MYSQLTEST_VARDIR/tmp/t1.cfg
 --remove_file $MYSQLTEST_VARDIR/tmp/t1.ibd
-
-eval SET GLOBAL INNODB_FILE_PER_TABLE=$innodb_file_per_table;
-eval SET GLOBAL INNODB_FILE_FORMAT=$innodb_file_format;
-eval SET SESSION innodb_strict_mode=$innodb_strict_mode_orig;
diff --git a/mysql-test/suite/innodb/t/innodb-wl5522-zip.test b/mysql-test/suite/innodb/t/innodb-wl5522-zip.test
index 395e4def85d..4181b52573c 100644
--- a/mysql-test/suite/innodb/t/innodb-wl5522-zip.test
+++ b/mysql-test/suite/innodb/t/innodb-wl5522-zip.test
@@ -9,22 +9,7 @@
 
 call mtr.add_suppression("InnoDB: Unable to import tablespace .* because it already exists.  Please DISCARD the tablespace before IMPORT.");
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
-let $innodb_file_per_table = `SELECT @@innodb_file_per_table`;
-let $innodb_file_format = `SELECT @@innodb_file_format`;
-let $innodb_strict_mode_orig=`select @@session.innodb_strict_mode`;
-
-SET GLOBAL innodb_file_per_table = 1;
-SELECT @@innodb_file_per_table;
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SELECT @@innodb_file_format;
-
 SET SESSION innodb_strict_mode=1;
-SELECT @@SESSION.innodb_strict_mode;
 
 let $MYSQLD_TMPDIR = `SELECT @@tmpdir`;
 let $MYSQLD_DATADIR = `SELECT @@datadir`;
@@ -87,15 +72,8 @@ DROP TABLE t1;
 --remove_file $MYSQLD_TMPDIR/t1.cfg
 --remove_file $MYSQLD_TMPDIR/t1.ibd
 
-SET GLOBAL innodb_file_per_table = 1;
-SELECT @@innodb_file_per_table;
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SELECT @@innodb_file_format;
-
 # restore session variable
 SET SESSION innodb_strict_mode=1;
-SELECT @@SESSION.innodb_strict_mode;
 
 let MYSQLD_DATADIR =`SELECT @@datadir`;
 
@@ -218,7 +196,7 @@ DROP TABLE t1;
 # table and restore, this time the table has a secondary index too.
 CREATE TABLE t1(
 	c1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-	c2 INT, INDEX(c2)) ENGINE=InnoDB  
+	c2 INT, INDEX(c2)) ENGINE=InnoDB
         ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
 
 INSERT INTO t1(c2) VALUES(1);
@@ -540,7 +518,3 @@ call mtr.add_suppression("InnoDB: The table .* doesn't have a corresponding tabl
 # cleanup
 --remove_file $MYSQLTEST_VARDIR/tmp/t1.cfg
 --remove_file $MYSQLTEST_VARDIR/tmp/t1.ibd
-
-eval SET GLOBAL INNODB_FILE_FORMAT=$innodb_file_format;
-eval SET GLOBAL INNODB_FILE_PER_TABLE=$innodb_file_per_table;
-eval SET SESSION innodb_strict_mode=$innodb_strict_mode_orig;
diff --git a/mysql-test/suite/innodb/t/innodb-wl5522.test b/mysql-test/suite/innodb/t/innodb-wl5522.test
index b04c726b74a..138e02e1214 100644
--- a/mysql-test/suite/innodb/t/innodb-wl5522.test
+++ b/mysql-test/suite/innodb/t/innodb-wl5522.test
@@ -5,19 +5,6 @@
 
 call mtr.add_suppression("InnoDB: Unable to import tablespace .* because it already exists.  Please DISCARD the tablespace before IMPORT.");
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
-let $innodb_file_per_table = `SELECT @@innodb_file_per_table`;
-let $innodb_file_format = `SELECT @@innodb_file_format`;
-
-SET GLOBAL innodb_file_per_table = 1;
-SELECT @@innodb_file_per_table;
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SELECT @@innodb_file_format;
-
 let $MYSQLD_TMPDIR = `SELECT @@tmpdir`;
 let $MYSQLD_DATADIR = `SELECT @@datadir`;
 
@@ -80,12 +67,6 @@ DROP TABLE t1;
 --remove_file $MYSQLD_TMPDIR/t1.cfg
 --remove_file $MYSQLD_TMPDIR/t1.ibd
 
-SET GLOBAL innodb_file_per_table = 1;
-SELECT @@innodb_file_per_table;
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SELECT @@innodb_file_format;
-
 let MYSQLD_DATADIR =`SELECT @@datadir`;
 
 # Try importing when tablespace already exists
@@ -881,6 +862,3 @@ call mtr.add_suppression("InnoDB: The table .* doesn't have a corresponding tabl
 # cleanup
 --remove_file $MYSQLTEST_VARDIR/tmp/t1.cfg
 --remove_file $MYSQLTEST_VARDIR/tmp/t1.ibd
-
-eval SET GLOBAL INNODB_FILE_FORMAT=$innodb_file_format;
-eval SET GLOBAL INNODB_FILE_PER_TABLE=$innodb_file_per_table;
diff --git a/mysql-test/suite/innodb/t/innodb_blob_truncate.test b/mysql-test/suite/innodb/t/innodb_blob_truncate.test
index 8a4248c795e..3e54ec80e2b 100644
--- a/mysql-test/suite/innodb/t/innodb_blob_truncate.test
+++ b/mysql-test/suite/innodb/t/innodb_blob_truncate.test
@@ -1,14 +1,6 @@
 --source include/have_innodb.inc
 --source include/have_innodb_16k.inc
 
---disable_query_log
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
---enable_query_log
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
-
 create table t1(a blob) engine=innodb key_block_size=8;
 delimiter //;
 create function generate_blob()
@@ -38,8 +30,3 @@ if ($x) {
 }
 drop table t1;
 drop function generate_blob;
-
---disable_query_log
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
---enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test b/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
index adae10df2ad..7fb4037e6bb 100644
--- a/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
+++ b/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
@@ -16,20 +16,10 @@
 # which is not there with embedded mode
 --source include/not_embedded.inc
 # Save innodb variables
-let $innodb_file_format_orig=`select @@innodb_file_format`;
-let $innodb_file_per_table_orig=`select @@innodb_file_per_table`;
 let $innodb_large_prefix_orig=`select @@innodb_large_prefix`;
 
-# Set Innodb file format as feature works for Barracuda file format
-set global innodb_file_format="Barracuda";
-set global innodb_file_per_table=1;
 set global innodb_large_prefix=1;
 
--- disable_warnings
-DROP TABLE IF EXISTS worklog5743;
--- enable_warnings
-
-
 #------------------------------------------------------------------------------
 # Stop the server in between when prefix index are created and see if state is
 # correct when server is restarted.
@@ -111,6 +101,4 @@ DROP TABLE worklog5743;
 
 #------------------------------------------------------------------------------
 
-eval SET GLOBAL innodb_file_format=$innodb_file_format_orig;
-eval SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig;
 eval SET GLOBAL innodb_large_prefix=$innodb_large_prefix_orig;