diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-26 11:50:32 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-26 11:50:32 +0200 |
| commit | 356c149603285086d964c8a51107be97b981c15c (patch) | |
| tree | 932c4199fcd51bcda3052d6fbbfba7877a385330 /include | |
| parent | e9e1890162c2f75e399229f08dd9924d55d9655b (diff) | |
| parent | 2e67b9f665875928605880661fc5aa1a15175f53 (diff) | |
| download | mariadb-git-356c149603285086d964c8a51107be97b981c15c.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_valgrind.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_valgrind.h b/include/my_valgrind.h index daea5266a28..260521d4d4b 100644 --- a/include/my_valgrind.h +++ b/include/my_valgrind.h @@ -27,6 +27,7 @@ #if __has_feature(memory_sanitizer) # include <sanitizer/msan_interface.h> # define HAVE_valgrind +# define HAVE_MEM_CHECK # define MEM_UNDEFINED(a,len) __msan_allocated_memory(a,len) # define MEM_MAKE_ADDRESSABLE(a,len) MEM_UNDEFINED(a,len) # define MEM_MAKE_DEFINED(a,len) __msan_unpoison(a,len) @@ -38,6 +39,7 @@ # define REDZONE_SIZE 8 #elif defined(HAVE_VALGRIND_MEMCHECK_H) && defined(HAVE_valgrind) # include <valgrind/memcheck.h> +# define HAVE_MEM_CHECK # define MEM_UNDEFINED(a,len) VALGRIND_MAKE_MEM_UNDEFINED(a,len) # define MEM_MAKE_ADDRESSABLE(a,len) MEM_UNDEFINED(a,len) # define MEM_MAKE_DEFINED(a,len) VALGRIND_MAKE_MEM_DEFINED(a,len) |