Commit 3297e716 authored by Sergei Golubchik's avatar Sergei Golubchik

cleanup: remove unused init_dynamic_array and init_dynamic_array2 symbols,

as only my_init_dynamic_array and my_init_dynamic_array2 are used everywhere.
fix ha_cassandra to compile.
parent 382c4a74
...@@ -785,9 +785,8 @@ extern my_bool real_open_cached_file(IO_CACHE *cache); ...@@ -785,9 +785,8 @@ extern my_bool real_open_cached_file(IO_CACHE *cache);
extern void close_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, File create_temp_file(char *to, const char *dir, const char *pfx,
int mode, myf MyFlags); int mode, myf MyFlags);
#define my_init_dynamic_array(A,B,C,D,E) init_dynamic_array2(A,B,NULL,C,D,E) #define my_init_dynamic_array(A,B,C,D,E) my_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 my_init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size,
extern my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size,
void *init_buffer, uint init_alloc, void *init_buffer, uint init_alloc,
uint alloc_increment, myf my_flags); uint alloc_increment, myf my_flags);
extern my_bool insert_dynamic(DYNAMIC_ARRAY *array, const uchar * element); extern my_bool insert_dynamic(DYNAMIC_ARRAY *array, const uchar * element);
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
Initiate dynamic array Initiate dynamic array
SYNOPSIS SYNOPSIS
init_dynamic_array2() my_init_dynamic_array2()
array Pointer to an array array Pointer to an array
element_size Size of element element_size Size of element
init_buffer Initial buffer pointer init_buffer Initial buffer pointer
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
my_flags Flags to my_malloc my_flags Flags to my_malloc
DESCRIPTION DESCRIPTION
init_dynamic_array() initiates array and allocate space for my_init_dynamic_array2() initiates array and allocate space for
init_alloc eilements. init_alloc eilements.
Array is usable even if space allocation failed, hence, the Array is usable even if space allocation failed, hence, the
function never returns TRUE. function never returns TRUE.
...@@ -41,11 +41,11 @@ ...@@ -41,11 +41,11 @@
FALSE Ok FALSE Ok
*/ */
my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size, my_bool my_init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size,
void *init_buffer, uint init_alloc, void *init_buffer, uint init_alloc,
uint alloc_increment, myf my_flags) uint alloc_increment, myf my_flags)
{ {
DBUG_ENTER("init_dynamic_array2"); DBUG_ENTER("my_init_dynamic_array2");
if (!alloc_increment) if (!alloc_increment)
{ {
alloc_increment=max((8192-MALLOC_OVERHEAD)/element_size,16); alloc_increment=max((8192-MALLOC_OVERHEAD)/element_size,16);
......
...@@ -1467,12 +1467,12 @@ bool ha_cassandra::setup_field_converters(Field **field_arg, uint n_fields) ...@@ -1467,12 +1467,12 @@ bool ha_cassandra::setup_field_converters(Field **field_arg, uint n_fields)
special_type_field_names= special_type_field_names=
((LEX_STRING*)(special_type_field_converters + max_non_default_fields)); ((LEX_STRING*)(special_type_field_converters + max_non_default_fields));
if (init_dynamic_array(&dynamic_values, if (my_init_dynamic_array(&dynamic_values,
sizeof(DYNAMIC_COLUMN_VALUE), sizeof(DYNAMIC_COLUMN_VALUE),
DYNCOL_USUAL, DYNCOL_DELTA)) DYNCOL_USUAL, DYNCOL_DELTA))
DBUG_RETURN(true); DBUG_RETURN(true);
else else
if (init_dynamic_array(&dynamic_names, if (my_init_dynamic_array(&dynamic_names,
sizeof(LEX_STRING), sizeof(LEX_STRING),
DYNCOL_USUAL, DYNCOL_DELTA)) DYNCOL_USUAL, DYNCOL_DELTA))
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment