summaryrefslogtreecommitdiff
path: root/mysys/tree.c
diff options
context:
space:
mode:
authormonty@tik.mysql.fi <>2001-07-10 16:09:15 +0300
committermonty@tik.mysql.fi <>2001-07-10 16:09:15 +0300
commit1e6fe8f10e27b76e1bb55013e13c27b656b0491c (patch)
tree70d1bba8d49381f882d2acbcf6fcaa3d6f15a284 /mysys/tree.c
parent080f7d4dd13151f16c435f601800f6f606c86a00 (diff)
parentfc81fdb4ba76c25bb387ede8fd879a4392ea783e (diff)
downloadmariadb-git-1e6fe8f10e27b76e1bb55013e13c27b656b0491c.tar.gz
merge
Diffstat (limited to 'mysys/tree.c')
-rw-r--r--mysys/tree.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/tree.c b/mysys/tree.c
index f62710f4cdd..e02033ff413 100644
--- a/mysys/tree.c
+++ b/mysys/tree.c
@@ -97,7 +97,8 @@ void init_tree(TREE *tree, uint default_alloc_size, uint memory_limit,
DBUG_ENTER("init_tree");
DBUG_PRINT("enter",("tree: %lx size: %d",tree,size));
- default_alloc_size=DEFAULT_ALLOC_SIZE;
+ if (!default_alloc_size)
+ default_alloc_size= DEFAULT_ALLOC_SIZE;
bzero((gptr) &tree->null_element,sizeof(tree->null_element));
tree->root= &tree->null_element;
tree->compare=compare;