diff options
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/array.c | 8 | ||||
| -rw-r--r-- | mysys/hash.c | 6 |
2 files changed, 7 insertions, 7 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); diff --git a/mysys/hash.c b/mysys/hash.c index e37bea3846c..727df46758c 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -37,15 +37,15 @@ static uint calc_hashnr_caseup(const byte *key,uint length); static int hashcmp(HASH *hash,HASH_LINK *pos,const byte *key,uint length); -my_bool hash_init(HASH *hash,uint size,uint key_offset,uint key_length, +my_bool _hash_init(HASH *hash,uint size,uint key_offset,uint key_length, hash_get_key get_key, - void (*free_element)(void*),uint flags) + void (*free_element)(void*),uint flags CALLER_INFO_PROTO) { DBUG_ENTER("hash_init"); DBUG_PRINT("enter",("hash: %lx size: %d",hash,size)); hash->records=0; - if (init_dynamic_array(&hash->array,sizeof(HASH_LINK),size,0)) + if (init_dynamic_array_ci(&hash->array,sizeof(HASH_LINK),size,0)) { hash->free=0; /* Allow call to hash_free */ DBUG_RETURN(TRUE); |