diff options
| author | monty@tik.mysql.fi <> | 2001-07-10 15:53:08 +0300 |
|---|---|---|
| committer | monty@tik.mysql.fi <> | 2001-07-10 15:53:08 +0300 |
| commit | fc81fdb4ba76c25bb387ede8fd879a4392ea783e (patch) | |
| tree | 6c8e56d350fb233a41c963d85544d41c0151c8ec /mysys/tree.c | |
| parent | ca771c46bbe5e9ea7742902f9116f3e210e92fea (diff) | |
| download | mariadb-git-fc81fdb4ba76c25bb387ede8fd879a4392ea783e.tar.gz | |
Redefinition of myisam_bulk_insert_tree_size
Removed new error message
Fixed test case for varbinary
Threads are again killable in "merge_buffers"
Cleanup of sql_repl.cc
SHOW OPEN TABLES now works when no tables are opened
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; |