diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-03-25 15:06:56 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-03-25 15:06:56 +1100 |
| commit | 88ce8a3d8be0346b325bc4da75894cd15e255857 (patch) | |
| tree | 1e827eb908eaa737225017627beafa2b6d8e9959 /mysql-test/include | |
| parent | f6fcf827b379fc069563d1896850fbfcebaa983e (diff) | |
| parent | 13b97880bd8f6901225a1f8d6ff2eb6ba9303ceb (diff) | |
| download | mariadb-git-88ce8a3d8be0346b325bc4da75894cd15e255857.tar.gz | |
Merge 10.7 into 10.8
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 |