diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-23 16:18:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-23 16:18:53 +0100 |
| commit | e3f08e7e0bbc56cd401bb1031827571498c15904 (patch) | |
| tree | 4724a2ea1a822489f3ad1a88969585a512b57ac6 | |
| parent | 682da0aa750c059a4f81fadcdf42c9211602eda7 (diff) | |
| download | mariadb-git-e3f08e7e0bbc56cd401bb1031827571498c15904.tar.gz | |
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.
| -rw-r--r-- | include/my_sys.h | 5 | ||||
| -rw-r--r-- | mysys/array.c | 8 | ||||
| -rw-r--r-- | storage/cassandra/ha_cassandra.cc | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 8f19293deb0..62e194157eb 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -785,9 +785,8 @@ 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) 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, +#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, void *init_buffer, uint init_alloc, uint alloc_increment, myf my_flags); extern my_bool insert_dynamic(DYNAMIC_ARRAY *array, const uchar * element); diff --git a/mysys/array.c b/mysys/array.c index 5aa1b1abb88..f72b8951870 100644 --- a/mysys/array.c +++ b/mysys/array.c @@ -22,7 +22,7 @@ Initiate dynamic array SYNOPSIS - init_dynamic_array2() + my_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 - init_dynamic_array() initiates array and allocate space for + my_init_dynamic_array2() 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 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, uint alloc_increment, myf my_flags) { - DBUG_ENTER("init_dynamic_array2"); + DBUG_ENTER("my_init_dynamic_array2"); if (!alloc_increment) { alloc_increment=max((8192-MALLOC_OVERHEAD)/element_size,16); diff --git a/storage/cassandra/ha_cassandra.cc b/storage/cassandra/ha_cassandra.cc index f2067969a5b..811374b2a57 100644 --- a/storage/cassandra/ha_cassandra.cc +++ b/storage/cassandra/ha_cassandra.cc @@ -1467,12 +1467,12 @@ bool ha_cassandra::setup_field_converters(Field **field_arg, uint n_fields) special_type_field_names= ((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), DYNCOL_USUAL, DYNCOL_DELTA)) DBUG_RETURN(true); else - if (init_dynamic_array(&dynamic_names, + if (my_init_dynamic_array(&dynamic_names, sizeof(LEX_STRING), DYNCOL_USUAL, DYNCOL_DELTA)) { |