summaryrefslogtreecommitdiff
path: root/mysys/tree.c
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-06-26 07:56:55 +0300
committermonty@mashka.mysql.fi <>2003-06-26 07:56:55 +0300
commit5f556f11e0e0ef0daefd41829cd400cc7addb583 (patch)
tree80a9ea494fdef18a20b754a4ce6bfd8179e5cfe0 /mysys/tree.c
parent7655f05dc2377b3df8b9fabb0e622781f65d5b60 (diff)
downloadmariadb-git-5f556f11e0e0ef0daefd41829cd400cc7addb583.tar.gz
Fixed memory allocation in Unique to not allocate too much memory
Diffstat (limited to 'mysys/tree.c')
-rw-r--r--mysys/tree.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysys/tree.c b/mysys/tree.c
index ea5cf79f084..2b5ea717809 100644
--- a/mysys/tree.c
+++ b/mysys/tree.c
@@ -90,6 +90,11 @@ void init_tree(TREE *tree, uint default_alloc_size, uint memory_limit,
if (!free_element && size >= 0 &&
((uint) size <= sizeof(void*) || ((uint) size & (sizeof(void*)-1))))
{
+ /*
+ We know that the data doesn't have to be aligned (like if the key
+ contains a double), so we can store the data combined with the
+ TREE_ELEMENT.
+ */
tree->offset_to_key=sizeof(TREE_ELEMENT); /* Put key after element */
/* Fix allocation size so that we don't lose any memory */
default_alloc_size/=(sizeof(TREE_ELEMENT)+size);