diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-28 16:05:21 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-28 16:05:21 +0200 |
| commit | 085d0ac23868603bc7400d4b0949c63ce3a85a31 (patch) | |
| tree | 40336fd6ee3f3d63d4425e763ae6fa5bec36ef9c /mysql-test/include | |
| parent | 3e2ad0e918d5d38322994ec9e08fc5dda3a80707 (diff) | |
| parent | c14a39431b211017e6809bb79c4079b38ffc3dff (diff) | |
| download | mariadb-git-085d0ac23868603bc7400d4b0949c63ce3a85a31.tar.gz | |
Merge 10.5 into 10.6
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; } |