diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-06 16:06:52 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-06 16:06:52 +0200 |
| commit | c5fdb988b7419ec953f2365a1ecff2fe6ccb3200 (patch) | |
| tree | 0cb9783ae9dfc275cbe3bcff0fd97aba05d93284 /mysql-test/include | |
| parent | 2d6a806367a8284fe3636d3aa5a89850081c4a8a (diff) | |
| parent | 9267160c11aea65c4734141547354b23053e284f (diff) | |
| download | mariadb-git-c5fdb988b7419ec953f2365a1ecff2fe6ccb3200.tar.gz | |
Merge 10.11 into 11.0
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; } |