diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-03-25 11:31:49 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-03-25 11:31:49 +1100 |
| commit | ec62f46a612b52aa75d61b971d0a7eb781cc19c1 (patch) | |
| tree | 81060b4bf9496fac23857060100089535ba83b27 /mysql-test/include | |
| parent | 0da5f45a50b5a3bba9fcb9959af04d8229c94188 (diff) | |
| parent | 157a838b1951d5767794ddfa211684ad9108a59d (diff) | |
| download | mariadb-git-ec62f46a612b52aa75d61b971d0a7eb781cc19c1.tar.gz | |
Merge 10.5 to 10.6
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_innodb.inc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/include/have_innodb.inc b/mysql-test/include/have_innodb.inc index 69ffdb5b284..0de070e1994 100644 --- a/mysql-test/include/have_innodb.inc +++ b/mysql-test/include/have_innodb.inc @@ -2,3 +2,15 @@ # suite.pm will make sure that all tests including this file # will be skipped unless innodb is enabled # +--disable_query_log +if (`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`) +{ +SET STATEMENT sql_log_bin=0 FOR +call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations"); +} +if ($VALGRIND_TEST) +{ +SET STATEMENT sql_log_bin=0 FOR +call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations"); +} +--enable_query_log |