diff options
| author | unknown <sanja@askmonty.org> | 2013-09-17 22:05:15 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2013-09-17 22:05:15 +0300 |
| commit | 9dbeb9882f2d339b16161dfab910817f11f95f37 (patch) | |
| tree | 87274cc6d01d5ef5724c5d56cea2d80fa4f94f6d /include/ma_dyncol.h | |
| parent | ce0d5539ea499ff63bfc54a308a9d670e80babbf (diff) | |
| download | mariadb-git-9dbeb9882f2d339b16161dfab910817f11f95f37.tar.gz | |
MDEV-4993:Impossible to free a dynamic column
Fix of API of dynamic columns (it made uniform and real function used to free the string).
Diffstat (limited to 'include/ma_dyncol.h')
| -rw-r--r-- | include/ma_dyncol.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/include/ma_dyncol.h b/include/ma_dyncol.h index ed5eb1e6bae..e14b04ce7f0 100644 --- a/include/ma_dyncol.h +++ b/include/ma_dyncol.h @@ -126,11 +126,11 @@ dynamic_column_get(DYNAMIC_COLUMN *org, uint column_nr, /* new functions */ enum enum_dyncol_func_result -mariadb_dyncol_create_many(DYNAMIC_COLUMN *str, - uint column_count, - uint *column_numbers, - DYNAMIC_COLUMN_VALUE *values, - my_bool new_string); +mariadb_dyncol_create_many_num(DYNAMIC_COLUMN *str, + uint column_count, + uint *column_numbers, + DYNAMIC_COLUMN_VALUE *values, + my_bool new_string); enum enum_dyncol_func_result mariadb_dyncol_create_many_named(DYNAMIC_COLUMN *str, uint column_count, @@ -140,10 +140,10 @@ mariadb_dyncol_create_many_named(DYNAMIC_COLUMN *str, enum enum_dyncol_func_result -mariadb_dyncol_update_many(DYNAMIC_COLUMN *str, - uint add_column_count, - uint *column_keys, - DYNAMIC_COLUMN_VALUE *values); +mariadb_dyncol_update_many_num(DYNAMIC_COLUMN *str, + uint add_column_count, + uint *column_keys, + DYNAMIC_COLUMN_VALUE *values); enum enum_dyncol_func_result mariadb_dyncol_update_many_named(DYNAMIC_COLUMN *str, uint add_column_count, @@ -152,13 +152,13 @@ mariadb_dyncol_update_many_named(DYNAMIC_COLUMN *str, enum enum_dyncol_func_result -mariadb_dyncol_exists(DYNAMIC_COLUMN *org, uint column_nr); +mariadb_dyncol_exists_num(DYNAMIC_COLUMN *org, uint column_nr); enum enum_dyncol_func_result mariadb_dyncol_exists_named(DYNAMIC_COLUMN *str, MYSQL_LEX_STRING *name); /* List of not NULL columns */ enum enum_dyncol_func_result -mariadb_dyncol_list(DYNAMIC_COLUMN *str, uint *count, uint **nums); +mariadb_dyncol_list_num(DYNAMIC_COLUMN *str, uint *count, uint **nums); enum enum_dyncol_func_result mariadb_dyncol_list_named(DYNAMIC_COLUMN *str, uint *count, MYSQL_LEX_STRING **names); @@ -167,8 +167,8 @@ mariadb_dyncol_list_named(DYNAMIC_COLUMN *str, uint *count, if the column do not exists it is NULL */ enum enum_dyncol_func_result -mariadb_dyncol_get(DYNAMIC_COLUMN *org, uint column_nr, - DYNAMIC_COLUMN_VALUE *store_it_here); +mariadb_dyncol_get_num(DYNAMIC_COLUMN *org, uint column_nr, + DYNAMIC_COLUMN_VALUE *store_it_here); enum enum_dyncol_func_result mariadb_dyncol_get_named(DYNAMIC_COLUMN *str, MYSQL_LEX_STRING *name, DYNAMIC_COLUMN_VALUE *store_it_here); @@ -181,8 +181,8 @@ mariadb_dyncol_check(DYNAMIC_COLUMN *str); enum enum_dyncol_func_result mariadb_dyncol_json(DYNAMIC_COLUMN *str, DYNAMIC_STRING *json); -#define dynamic_column_initialize(A) memset((A), 0, sizeof(*(A))) -#define dynamic_column_column_free(V) dynstr_free(V) +#define mariadb_dyncol_init(A) memset((A), 0, sizeof(*(A))) +void mariadb_dyncol_free(DYNAMIC_COLUMN *str); /* conversion of values to 3 base types */ enum enum_dyncol_func_result |