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 /sql/item_strfunc.cc | |
| 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 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index cf8ce614b6d..6e47cc3c49e 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -4220,11 +4220,11 @@ String *Item_func_dyncol_create::val_str(String *str) if ((rc= ((names || force_names) ? mariadb_dyncol_create_many_named(&col, column_count, keys_str, vals, TRUE) : - mariadb_dyncol_create_many(&col, column_count, keys_num, - vals, TRUE)))) + mariadb_dyncol_create_many_num(&col, column_count, keys_num, + vals, TRUE)))) { dynamic_column_error_message(rc); - dynamic_column_column_free(&col); + mariadb_dyncol_free(&col); res= NULL; null_value= TRUE; } @@ -4363,11 +4363,11 @@ String *Item_func_dyncol_add::val_str(String *str) if ((rc= ((names || force_names) ? mariadb_dyncol_update_many_named(&col, column_count, keys_str, vals) : - mariadb_dyncol_update_many(&col, column_count, - keys_num, vals)))) + mariadb_dyncol_update_many_num(&col, column_count, + keys_num, vals)))) { dynamic_column_error_message(rc); - dynamic_column_column_free(&col); + mariadb_dyncol_free(&col); goto null; } @@ -4470,7 +4470,7 @@ bool Item_dyncol_get::get_dyn_value(DYNAMIC_COLUMN_VALUE *val, String *tmp) dyn_str.str= (char*) res->ptr(); dyn_str.length= res->length(); if ((rc= ((name == NULL) ? - mariadb_dyncol_get(&dyn_str, (uint) num, val) : + mariadb_dyncol_get_num(&dyn_str, (uint) num, val) : mariadb_dyncol_get_named(&dyn_str, name, val)))) { dynamic_column_error_message(rc); |