diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-05 09:25:33 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-05 09:25:33 +0200 |
| commit | 3f42529a6f799a550201551d73014d9d52d3bd94 (patch) | |
| tree | 3079a595e71eed61845baf19d9aad9edaf3026d6 /mysql-test | |
| parent | aba15b864af664276261dcbbdaef35268d407af1 (diff) | |
| parent | cb5374801e594282b41883bf38892d4788668df1 (diff) | |
| download | mariadb-git-3f42529a6f799a550201551d73014d9d52d3bd94.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/innodb/t/log_file_size.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/t/log_file_size.test b/mysql-test/suite/innodb/t/log_file_size.test index 9cc7742f6a8..061bf35ccef 100644 --- a/mysql-test/suite/innodb/t/log_file_size.test +++ b/mysql-test/suite/innodb/t/log_file_size.test @@ -26,7 +26,8 @@ call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE faile call mtr.add_suppression("InnoDB: Plugin initialization aborted"); call mtr.add_suppression("InnoDB: innodb_read_only prevents crash recovery"); call mtr.add_suppression("InnoDB: Are you sure you are using the right ib_logfiles"); -call mtr.add_suppression("InnoDB: Cannot create log files in read-only mode"); +call mtr.add_suppression("InnoDB: Cannot (create|resize) log files in read-only mode"); +call mtr.add_suppression("InnoDB: Can't initiate database recovery, running in read-only-mode"); call mtr.add_suppression("InnoDB: Only one log file found"); call mtr.add_suppression("InnoDB: Log file .*ib_logfile[01].* size"); call mtr.add_suppression("InnoDB: Unable to open .*ib_logfile0. to check native AIO read support"); |