diff options
| author | unknown <monty@tik.mysql.fi> | 2001-07-10 16:09:15 +0300 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2001-07-10 16:09:15 +0300 |
| commit | bfefbf8b3b05f3cefe3dda0d8e1454af7237527e (patch) | |
| tree | 70d1bba8d49381f882d2acbcf6fcaa3d6f15a284 /mysys/tree.c | |
| parent | 1dd0fe2e78dcdd44ca1ff444c20049678d2d12bf (diff) | |
| parent | 9914a0c8471b9ee1f041b13c11211fe277cfcd91 (diff) | |
| download | mariadb-git-bfefbf8b3b05f3cefe3dda0d8e1454af7237527e.tar.gz | |
merge
Docs/manual.texi:
Auto merged
Diffstat (limited to 'mysys/tree.c')
| -rw-r--r-- | mysys/tree.c | 3 |
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; |