diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-03-08 15:16:13 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-03-08 15:16:13 +0200 |
| commit | ce675406ca8dbc1532a908803a1371de8432d466 (patch) | |
| tree | ff680b0286739433991141029e0bd2d47a28298b | |
| parent | 1754c7da967a9e3555ef0c097a91b73cb7e44ee5 (diff) | |
| parent | 251a5fa97598c8f0e7e0759880503d0932ca2918 (diff) | |
| download | mariadb-git-ce675406ca8dbc1532a908803a1371de8432d466.tar.gz | |
Automatic merge with 5.1
| -rw-r--r-- | mysql-test/include/mtr_check.sql | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql index 36f857d5f58..fcd5eebc269 100644 --- a/mysql-test/include/mtr_check.sql +++ b/mysql-test/include/mtr_check.sql @@ -13,6 +13,7 @@ BEGIN -- that are supposed to change SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name != 'timestamp' + AND variable_name not like "Last_IO_Err*" AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND variable_name != 'INNODB_FILE_FORMAT_CHECK' ORDER BY variable_name; |