diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2006-11-30 18:25:05 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2006-11-30 18:25:05 +0200 |
| commit | 3d4095603952aca95892d55fb1ef435132de1197 (patch) | |
| tree | 66e16346c4fdfa20f915fdf53ea1f9419c07331c /mysys/tree.c | |
| parent | 0bee93e038edf9a70ffe9d10cd93883a3288802f (diff) | |
| download | mariadb-git-3d4095603952aca95892d55fb1ef435132de1197.tar.gz | |
Fixed portability issue in my_thr_init.c (was added in my last push)
Fixed compiler warnings (detected by VC++):
- Removed not used variables
- Added casts
- Fixed wrong assignments to bool
- Fixed wrong calls with bool arguments
- Added missing argument to store(longlong), which caused wrong store method to be called.
Diffstat (limited to 'mysys/tree.c')
| -rw-r--r-- | mysys/tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/tree.c b/mysys/tree.c index abbc99b2445..f295fa15575 100644 --- a/mysys/tree.c +++ b/mysys/tree.c @@ -84,7 +84,7 @@ static void rb_delete_fixup(TREE *tree,TREE_ELEMENT ***parent); static int test_rb_tree(TREE_ELEMENT *element); #endif -void init_tree(TREE *tree, uint default_alloc_size, uint memory_limit, +void init_tree(TREE *tree, ulong default_alloc_size, ulong memory_limit, int size, qsort_cmp2 compare, my_bool with_delete, tree_element_free free_element, void *custom_arg) { @@ -128,7 +128,7 @@ void init_tree(TREE *tree, uint default_alloc_size, uint memory_limit, } if (!(tree->with_delete=with_delete)) { - init_alloc_root(&tree->mem_root, default_alloc_size,0); + init_alloc_root(&tree->mem_root, (uint) default_alloc_size, 0); tree->mem_root.min_malloc=(sizeof(TREE_ELEMENT)+tree->size_of_element); } DBUG_VOID_RETURN; |