diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-26 15:21:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-26 15:21:20 +0300 |
| commit | e135edec3a33748c59cac1aba9017a9ec8ff7dc5 (patch) | |
| tree | dae27e6d487be0686a00d37edd76300238cff563 /include | |
| parent | 7725f870b03bb25ee3c19dffa3471e7905de1c03 (diff) | |
| parent | 1a66e3f861a722689a39f83919d1f1a5466f64bf (diff) | |
| download | mariadb-git-e135edec3a33748c59cac1aba9017a9ec8ff7dc5.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_valgrind.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/my_valgrind.h b/include/my_valgrind.h index a24ad597d36..dfe2c3db7b3 100644 --- a/include/my_valgrind.h +++ b/include/my_valgrind.h @@ -83,12 +83,6 @@ https://github.com/google/sanitizers/wiki/AddressSanitizerManualPoisoning */ # define MSAN_STAT_WORKAROUND(st) ((void) 0) #endif /* __has_feature(memory_sanitizer) */ -#ifdef HAVE_valgrind -#define IF_VALGRIND(A,B) A -#else -#define IF_VALGRIND(A,B) B -#endif - #ifdef TRASH_FREED_MEMORY /* _TRASH_FILL() has to call MEM_MAKE_ADDRESSABLE() to cancel any effect of |