diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-17 16:33:40 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-17 16:33:40 +0200 |
| commit | 4ef2e43080989cfb5ce62f5816505d17759c3f7c (patch) | |
| tree | 0d43fde597c04f7cf253a60eb96206755e068adc /mysys | |
| parent | 8f102b584d4e8f02da924f9be094014136eb453f (diff) | |
| parent | c6cd64f3cb4202fdadeb470fe28f6c50e337f460 (diff) | |
| download | mariadb-git-4ef2e43080989cfb5ce62f5816505d17759c3f7c.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_alloc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 3df73127998..b2a1264bd2b 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -325,7 +325,8 @@ void *multi_alloc_root(MEM_ROOT *root, ...) #define TRASH_MEM(X) TRASH(((char*)(X) + ((X)->size-(X)->left)), (X)->left) -/* Mark all data in blocks free for reusage */ +#if !(defined(HAVE_valgrind) && defined(EXTRA_DEBUG)) +/** Mark all data in blocks free for reusage */ static inline void mark_blocks_free(MEM_ROOT* root) { @@ -355,6 +356,7 @@ static inline void mark_blocks_free(MEM_ROOT* root) root->first_block_usage= 0; root->block_num= 4; } +#endif /* |