diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-05-05 11:05:55 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-05-05 11:05:55 +0400 |
| commit | db0917f68f2681882974afd53935aa8cba29c6b8 (patch) | |
| tree | 32a9f600b1913a5193e94c09ec442ea2cac14e19 /sql/item_func.cc | |
| parent | 96247be1a0dfa3035580b53b1c27a7247a410713 (diff) | |
| download | mariadb-git-db0917f68f2681882974afd53935aa8cba29c6b8.tar.gz | |
MDEV-12696 Crash with LOAD XML and non-updatable VIEW column
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 903d792db75..ba31f2794be 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -5675,14 +5675,15 @@ bool Item_user_var_as_out_param::fix_fields(THD *thd, Item **ref) } -void Item_user_var_as_out_param::set_null_value(CHARSET_INFO* cs) +void Item_user_var_as_out_param::load_data_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::set_value(const char *str, uint length, - CHARSET_INFO* cs) +void Item_user_var_as_out_param::load_data_set_value(const char *str, + uint length, + CHARSET_INFO* cs) { ::update_hash(entry, FALSE, (void*)str, length, STRING_RESULT, cs, 0 /* unsigned_arg */); @@ -5717,7 +5718,7 @@ my_decimal* Item_user_var_as_out_param::val_decimal(my_decimal *decimal_buffer) } -void Item_user_var_as_out_param::print_for_load(THD *thd, String *str) +void Item_user_var_as_out_param::load_data_print(THD *thd, String *str) { str->append('@'); append_identifier(thd, str, name.str, name.length); |