diff options
| author | Marc Alff <marc.alff@sun.com> | 2010-01-12 10:58:38 -0700 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2010-01-12 10:58:38 -0700 |
| commit | 253d7f25010552a97b603ed5129e3abd5b966426 (patch) | |
| tree | f97bf0080c9d12706cd2ed4abc160689028ced47 /sql/item_func.cc | |
| parent | e0e0f9e3d46917fe9b611fc9769e64032c267446 (diff) | |
| parent | 51caeae915d3a5add57a785e69b7ce52cac084ad (diff) | |
| download | mariadb-git-253d7f25010552a97b603ed5129e3abd5b966426.tar.gz | |
Merge mysql-next-mr (revno 2958) --> mysql-next-mr-marc
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index f9d9522fbbc..a7b2609470f 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2953,7 +2953,7 @@ udf_handler::fix_fields(THD *thd, Item_result_field *func, String *res= arguments[i]->val_str(&buffers[i]); if (arguments[i]->null_value) continue; - f_args.args[i]= (char*) res->c_ptr(); + f_args.args[i]= (char*) res->c_ptr_safe(); f_args.lengths[i]= res->length(); break; } |