diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-09-27 12:56:05 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-09-27 12:56:05 +0200 |
| commit | da756ef676100c3257a07394106d6c573ddc0225 (patch) | |
| tree | 5d6f1cb658da7f3ba6e869bde595f25077b01ce0 /mysql-test/include/mtr_check.sql | |
| parent | 031b52c415c3fe179117dc3ebc9b0a34914f1342 (diff) | |
| download | mariadb-git-da756ef676100c3257a07394106d6c573ddc0225.tar.gz | |
Bug #12844282 62075: MTR TESTS SHOULD NOT HAVE TO SAVE & RESET INNODB_FILE_FORMAT_CHECK
Added 'innodb_file_format_check' 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
For 5.5, apparently innodb_file_format_max is the one to ignore
Diffstat (limited to 'mysql-test/include/mtr_check.sql')
| -rw-r--r-- | mysql-test/include/mtr_check.sql | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql index 699a35a1831..64bb7c01544 100644 --- a/mysql-test/include/mtr_check.sql +++ b/mysql-test/include/mtr_check.sql @@ -27,7 +27,8 @@ BEGIN -- Dump all global variables except those -- that are supposed to change SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES - WHERE variable_name != 'timestamp' ORDER BY VARIABLE_NAME; + WHERE variable_name NOT IN ('timestamp', 'innodb_file_format_check') + ORDER BY VARIABLE_NAME; -- Dump all databases, there should be none -- except those that was created during bootstrap |