diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-22 15:15:17 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-22 15:15:17 +0200 |
| commit | b35743f9877fc826372eeb6dec21665aa3ff32f4 (patch) | |
| tree | 4361a08c36980010723e75e1bc79c974139e0d6c /mysql-test/include | |
| parent | 58bb0769bdf13a9747e900aa2f0955137738ce9d (diff) | |
| parent | e69b70140b936f59826de9dc79e4bf7f4821d52e (diff) | |
| download | mariadb-git-b35743f9877fc826372eeb6dec21665aa3ff32f4.tar.gz | |
Merge with xtradb code changes
(4 tests are still failing, so this push is not yet stable)
Diffstat (limited to 'mysql-test/include')
| -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 a5654d3596c..36f857d5f58 100644 --- a/mysql-test/include/mtr_check.sql +++ b/mysql-test/include/mtr_check.sql @@ -13,7 +13,8 @@ BEGIN -- that are supposed to change SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name != 'timestamp' - AND variable_name != 'INNODB_IBUF_MAX_SIZE' + AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND + variable_name != 'INNODB_FILE_FORMAT_CHECK' ORDER BY variable_name; -- Dump all databases, there should be none |