diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-10-05 15:14:14 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-10-05 15:14:14 +0200 |
| commit | dc265dc4a14af21b7982e66447b6d6250da81599 (patch) | |
| tree | 83247b9da98e05a063aedb4a30d61a2c31f86bc2 /mysql-test/suite/innodb/t/innodb-create-options.test | |
| parent | 996614178bc138285570eff95f085a774d1bedb8 (diff) | |
| parent | 968e4363fd2efd4bbb86aefbc84f7398ec54b1f7 (diff) | |
| download | mariadb-git-dc265dc4a14af21b7982e66447b6d6250da81599.tar.gz | |
Bug #12844282 62075: MTR TESTS SHOULD NOT HAVE TO SAVE & RESET INNODB_FILE_FORMAT_CHECK
This is a redo for 5.5
Added 'innodb_file_format_max' as variable to ignore change to.
Tests that had to restore this amended
Two tests assumed it to be Antelope, make sure these run on a freshly
started server
Diffstat (limited to 'mysql-test/suite/innodb/t/innodb-create-options.test')
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-create-options.test | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-create-options.test b/mysql-test/suite/innodb/t/innodb-create-options.test index 3daa5f09e71..d6726683e7e 100644 --- a/mysql-test/suite/innodb/t/innodb-create-options.test +++ b/mysql-test/suite/innodb/t/innodb-create-options.test @@ -61,7 +61,6 @@ SET storage_engine=InnoDB; --disable_query_log # These values can change during the test LET $innodb_file_format_orig=`select @@innodb_file_format`; -LET $innodb_file_format_max_orig=`select @@innodb_file_format_max`; LET $innodb_file_per_table_orig=`select @@innodb_file_per_table`; LET $innodb_strict_mode_orig=`select @@session.innodb_strict_mode`; --enable_query_log @@ -568,7 +567,6 @@ DROP TABLE IF EXISTS t1; --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; 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 |