Fix for bug #17615: invalid handling of function results in UPDATE...SET statement.

1 files changed, 2 insertions, 0 deletions

diff --git a/sql/item_func.cc b/sql/item_func.cc
index a85f05c2e22..ccfb71e9d0c 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -4881,6 +4881,7 @@ Item_func_sp::fix_length_and_dec()
   {
     decimals= result_field->decimals();
     max_length= result_field->field_length;
+    collation.set(result_field->charset());
     DBUG_VOID_RETURN;
   }
 
@@ -4891,6 +4892,7 @@ Item_func_sp::fix_length_and_dec()
   }
   decimals= field->decimals();
   max_length= field->field_length;
+  collation.set(field->charset());
   maybe_null= 1;
   delete field;
   DBUG_VOID_RETURN;