diff options
| author | unknown <serg@serg.mysql.com> | 2002-01-22 15:59:32 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-01-22 15:59:32 +0000 |
| commit | 4c7aeabfc5627024d190a96e3b0654f417011f5a (patch) | |
| tree | b05b3a2c4056704e10c90355f4427a725f6c7ff0 /mysys/array.c | |
| parent | 0c57c750a84abb0f822a6fe8ed4ef051ce6105af (diff) | |
| download | mariadb-git-4c7aeabfc5627024d190a96e3b0654f417011f5a.tar.gz | |
Framework to simplify memory leak tracing
Diffstat (limited to 'mysys/array.c')
| -rw-r--r-- | mysys/array.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysys/array.c b/mysys/array.c index 17e5ded322b..85dfdaa09d8 100644 --- a/mysys/array.c +++ b/mysys/array.c @@ -29,12 +29,12 @@ even if space allocation failed */ -my_bool init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size, - uint init_alloc, uint alloc_increment) +my_bool _init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size, + uint init_alloc, uint alloc_increment CALLER_INFO_PROTO) { DBUG_ENTER("init_dynamic_array"); if (!alloc_increment) - { + { alloc_increment=max((8192-MALLOC_OVERHEAD)/element_size,16); if (init_alloc > 8 && alloc_increment > init_alloc * 2) alloc_increment=init_alloc*2; @@ -46,7 +46,7 @@ my_bool init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size, array->max_element=init_alloc; array->alloc_increment=alloc_increment; array->size_of_element=element_size; - if (!(array->buffer=(char*) my_malloc(element_size*init_alloc,MYF(MY_WME)))) + if (!(array->buffer=(char*) my_malloc_ci(element_size*init_alloc,MYF(MY_WME)))) { array->max_element=0; DBUG_RETURN(TRUE); |