diff options
| -rw-r--r-- | include/my_sys.h | 5 | ||||
| -rw-r--r-- | mysys/array.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index bb7a9204678..4b4e5b7a22f 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -782,8 +782,9 @@ extern my_bool real_open_cached_file(IO_CACHE *cache); extern void close_cached_file(IO_CACHE *cache); File create_temp_file(char *to, const char *dir, const char *pfx, int mode, myf MyFlags); -#define my_init_dynamic_array(A,B,C,D,E) my_init_dynamic_array2(A,B,NULL,C,D,E) -extern my_bool my_init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size, +#define my_init_dynamic_array(A,B,C,D,E) init_dynamic_array2(A,B,NULL,C,D,E) +#define my_init_dynamic_array2(A,B,C,D,E,F) init_dynamic_array2(A,B,C,D,E,F) +extern my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size, void *init_buffer, uint init_alloc, uint alloc_increment, myf my_flags); extern my_bool insert_dynamic(DYNAMIC_ARRAY *array, const void* element); diff --git a/mysys/array.c b/mysys/array.c index e92c5b45e67..a8c5d181638 100644 --- a/mysys/array.c +++ b/mysys/array.c @@ -22,7 +22,7 @@ Initiate dynamic array SYNOPSIS - my_init_dynamic_array2() + init_dynamic_array2() array Pointer to an array element_size Size of element init_buffer Initial buffer pointer @@ -31,7 +31,7 @@ my_flags Flags to my_malloc DESCRIPTION - my_init_dynamic_array2() initiates array and allocate space for + init_dynamic_array() initiates array and allocate space for init_alloc eilements. Array is usable even if space allocation failed, hence, the function never returns TRUE. @@ -41,11 +41,11 @@ FALSE Ok */ -my_bool my_init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size, +my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size, void *init_buffer, uint init_alloc, uint alloc_increment, myf my_flags) { - DBUG_ENTER("my_init_dynamic_array2"); + DBUG_ENTER("init_dynamic_array2"); if (!alloc_increment) { alloc_increment=MY_MAX((8192-MALLOC_OVERHEAD)/element_size,16); |