diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-19 11:29:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-19 11:29:32 +0300 |
| commit | 7d2d9f04b9d308745d1a99a47a67f17ced128562 (patch) | |
| tree | dc10471ebbe79d0d035374665e84ba9c386d59f8 /mysql-test | |
| parent | 4a2595727465648f2d4e794d1b2f182345f0bee8 (diff) | |
| download | mariadb-git-7d2d9f04b9d308745d1a99a47a67f17ced128562.tar.gz | |
MDEV-20931 fixup
The merge commit 4a2595727465648f2d4e794d1b2f182345f0bee8
caused a test failure on Windows. The suppression regexp
needs to accept the backslash.
fil_invalid_page_access_msg(): Simplify the implementation
and invoke sql_print_error() directly.
fil_space_t::io(): Invoke fil_invalid_page_access_msg() only from
one location.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/innodb/r/import_corrupted.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/import_corrupted.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/r/import_corrupted.result b/mysql-test/suite/innodb/r/import_corrupted.result index fe431e62eef..149a48dccfe 100644 --- a/mysql-test/suite/innodb/r/import_corrupted.result +++ b/mysql-test/suite/innodb/r/import_corrupted.result @@ -1,6 +1,6 @@ call mtr.add_suppression("Table `test`.`t2` should have 2 indexes but the tablespace has 1 indexes"); call mtr.add_suppression("Index for table 't2' is corrupt; try to repair it"); -call mtr.add_suppression("Trying to read .* bytes at .* outside the bounds of the file: ./test/t2.ibd"); +call mtr.add_suppression("Trying to read .* bytes at .* outside the bounds of the file: \\..test.t2\\.ibd"); CREATE TABLE t1 ( id INT AUTO_INCREMENT PRIMARY KEY, not_id INT, diff --git a/mysql-test/suite/innodb/t/import_corrupted.test b/mysql-test/suite/innodb/t/import_corrupted.test index fcdb03b4601..976cbe03dbb 100644 --- a/mysql-test/suite/innodb/t/import_corrupted.test +++ b/mysql-test/suite/innodb/t/import_corrupted.test @@ -2,7 +2,7 @@ call mtr.add_suppression("Table `test`.`t2` should have 2 indexes but the tablespace has 1 indexes"); call mtr.add_suppression("Index for table 't2' is corrupt; try to repair it"); -call mtr.add_suppression("Trying to read .* bytes at .* outside the bounds of the file: ./test/t2.ibd"); +call mtr.add_suppression("Trying to read .* bytes at .* outside the bounds of the file: \\..test.t2\\.ibd"); let MYSQLD_DATADIR = `SELECT @@datadir`; |