Skip to content

Commit 499ef7b

Browse files
committed
Add a global suppression for O_DIRECT failures
Fixes up commit b8ad6fb
1 parent b8ad6fb commit 499ef7b

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

mysql-test/mysql-test-run.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4521,6 +4521,7 @@ ($$)
45214521
qr|Linux Native AIO|, # warning that aio does not work on /dev/shm
45224522
qr|InnoDB: io_setup\(\) attempt|,
45234523
qr|InnoDB: io_setup\(\) failed with EAGAIN|,
4524+
qr/InnoDB: Failed to set (O_DIRECT|DIRECTIO_ON) on file/,
45244525
qr|setrlimit could not change the size of core files to 'infinity';|,
45254526
qr|feedback plugin: failed to retrieve the MAC address|,
45264527
qr|Plugin 'FEEDBACK' init function returned error|,

mysql-test/suite/innodb/t/create_isl_with_direct.test

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
--disable_query_log
2-
call mtr.add_suppression("InnoDB: Failed to set .*DIRECT");
3-
# The below mtr suppression to avoid failure in solaris platform.
4-
CALL mtr.add_suppression("\\[ERROR\\] InnoDB: Failed to set DIRECTIO_ON on file.*");
5-
--enable_query_log
6-
71
--source include/not_embedded.inc
82
--source include/have_innodb.inc
93
--source include/have_symlink.inc

0 commit comments

Comments
 (0)