summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-11-29 11:06:29 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-11-29 11:06:29 +0200
commit499ef7bf23f6fe32ed261df04c4a2ca067961e77 (patch)
tree5b7c22ef17084998a7787ffca89526d340c47814
parentb8ad6fbd95830b61d282abc1167300fff261be7e (diff)
downloadmariadb-git-499ef7bf23f6fe32ed261df04c4a2ca067961e77.tar.gz
Add a global suppression for O_DIRECT failures
Fixes up commit b8ad6fbd95830b61d282abc1167300fff261be7e
-rwxr-xr-xmysql-test/mysql-test-run.pl1
-rw-r--r--mysql-test/suite/innodb/t/create_isl_with_direct.test6
2 files changed, 1 insertions, 6 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 60955ac61a7..12afab4d28c 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -4521,6 +4521,7 @@ sub extract_warning_lines ($$) {
qr|Linux Native AIO|, # warning that aio does not work on /dev/shm
qr|InnoDB: io_setup\(\) attempt|,
qr|InnoDB: io_setup\(\) failed with EAGAIN|,
+ qr/InnoDB: Failed to set (O_DIRECT|DIRECTIO_ON) on file/,
qr|setrlimit could not change the size of core files to 'infinity';|,
qr|feedback plugin: failed to retrieve the MAC address|,
qr|Plugin 'FEEDBACK' init function returned error|,
diff --git a/mysql-test/suite/innodb/t/create_isl_with_direct.test b/mysql-test/suite/innodb/t/create_isl_with_direct.test
index c6a9fbcb739..45d7fbf4ea5 100644
--- a/mysql-test/suite/innodb/t/create_isl_with_direct.test
+++ b/mysql-test/suite/innodb/t/create_isl_with_direct.test
@@ -1,9 +1,3 @@
---disable_query_log
-call mtr.add_suppression("InnoDB: Failed to set .*DIRECT");
-# The below mtr suppression to avoid failure in solaris platform.
-CALL mtr.add_suppression("\\[ERROR\\] InnoDB: Failed to set DIRECTIO_ON on file.*");
---enable_query_log
-
--source include/not_embedded.inc
--source include/have_innodb.inc
--source include/have_symlink.inc