summaryrefslogtreecommitdiff
path: root/mysys/my_alloc.c
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-01-17 11:28:02 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-01-17 11:28:02 +0200
commit04eef79bf93fc825cf2651633bcbcc21b20e3a83 (patch)
tree053e08c6a4eef222ecc52a579f4d82641a43c85b /mysys/my_alloc.c
parent822f4e6c1007a3ad4fbd7c3b340ea561566a6b6a (diff)
downloadmariadb-git-04eef79bf93fc825cf2651633bcbcc21b20e3a83.tar.gz
Do not define unused function mark_blocks_free()
Follow-up to commit 9ec19b9b41804d8d4491f0f58ac06ae417e02ffa
Diffstat (limited to 'mysys/my_alloc.c')
-rw-r--r--mysys/my_alloc.c4
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
/*