summaryrefslogtreecommitdiff
path: root/mysys/tree.c
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2011-02-01 14:19:58 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2011-02-01 14:19:58 +0100
commit7e206872128d891fffa5238c093c8d6506da8dbb (patch)
tree6165d2406ed5c65f0db313ef74dafc5726956e3d /mysys/tree.c
parent8041013fb166c071534115873a6d7d359e9ecaf5 (diff)
downloadmariadb-git-7e206872128d891fffa5238c093c8d6506da8dbb.tar.gz
Fix compile errors:
* declaration in the middle of the block in C file. * round() is only available in C99.
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 70f2972b03f..c8571fd0337 100644
--- a/mysys/tree.c
+++ b/mysys/tree.c
@@ -221,9 +221,10 @@ TREE_ELEMENT *tree_insert(TREE *tree, void *key, uint key_size,
}
if (element == &tree->null_element)
{
+ uint alloc_size;
if (tree->flag & TREE_ONLY_DUPS)
return((TREE_ELEMENT *) 1);
- uint alloc_size=sizeof(TREE_ELEMENT)+key_size+tree->size_of_element;
+ alloc_size=sizeof(TREE_ELEMENT)+key_size+tree->size_of_element;
tree->allocated+=alloc_size;
if (tree->memory_limit && tree->elements_in_tree