diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-06 13:39:12 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-06 13:39:12 +0200 |
| commit | 9267160c11aea65c4734141547354b23053e284f (patch) | |
| tree | 76f6f123c9d72df2719806dfe86405e19ed52f9e /mysql-test/include | |
| parent | 077425a65989e62149df1a23a73e50d0c793fb0f (diff) | |
| parent | 4ccb2be65fc1d392602473d50f8d9df29635a3eb (diff) | |
| download | mariadb-git-9267160c11aea65c4734141547354b23053e284f.tar.gz | |
Merge 10.10 into 10.11
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/not_valgrind_build.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/not_valgrind_build.inc b/mysql-test/include/not_valgrind_build.inc index 2b60f11bfc7..b62a1bc953b 100644 --- a/mysql-test/include/not_valgrind_build.inc +++ b/mysql-test/include/not_valgrind_build.inc @@ -1,4 +1,4 @@ -if (`select version() like '%valgrind%'`) +if (`select version() like '%valgrind%' || version() like '%asan%'`) { - skip Does not run with binaries built with valgrind; + skip Does not run with binaries built with valgrind or asan; } |