diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-05-09 13:24:52 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-05-09 13:24:52 +0200 |
| commit | c91ecf9e9bebf3cf2dafbd3193de4df94be09870 (patch) | |
| tree | a9ab429c8e8a6a50c38557cbdd38d9612480f49c /sql/item_func.cc | |
| parent | 2645bda5f20ab10bc26dc1cb69f91b5505c1faae (diff) | |
| parent | c92168fcd26aad35bd4cb5d65175e3545133f201 (diff) | |
| download | mariadb-git-c91ecf9e9bebf3cf2dafbd3193de4df94be09870.tar.gz | |
Merge branch '10.1' into 10.2
Revert commit db0917f68f, because the fix for MDEV-12696
is coming from 5.5 and 10.1 in this merge.
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index ba31f2794be..903d792db75 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -5675,15 +5675,14 @@ bool Item_user_var_as_out_param::fix_fields(THD *thd, Item **ref) } -void Item_user_var_as_out_param::load_data_set_null_value(CHARSET_INFO* cs) +void Item_user_var_as_out_param::set_null_value(CHARSET_INFO* cs) { ::update_hash(entry, TRUE, 0, 0, STRING_RESULT, cs, 0 /* unsigned_arg */); } -void Item_user_var_as_out_param::load_data_set_value(const char *str, - uint length, - CHARSET_INFO* cs) +void Item_user_var_as_out_param::set_value(const char *str, uint length, + CHARSET_INFO* cs) { ::update_hash(entry, FALSE, (void*)str, length, STRING_RESULT, cs, 0 /* unsigned_arg */); @@ -5718,7 +5717,7 @@ my_decimal* Item_user_var_as_out_param::val_decimal(my_decimal *decimal_buffer) } -void Item_user_var_as_out_param::load_data_print(THD *thd, String *str) +void Item_user_var_as_out_param::print_for_load(THD *thd, String *str) { str->append('@'); append_identifier(thd, str, name.str, name.length); |