Now string values are created and filled with charset field

SELECT func(charset2) FROM t ORDER BY 1 works in correct charset

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index aa4140192ab..9ff2734f460 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -271,7 +271,7 @@ public:
   double val() { return (double) value; }
   longlong val_int() { return value; }
   String *val_str(String *str)
-  { str_value.set(buff,buff_length); return &str_value; }
+  { str_value.set(buff,buff_length,default_charset_info); return &str_value; }
   const char *func_name() const { return "curtime"; }
   void fix_length_and_dec();
   void make_field(Send_field *tmp_field)
@@ -313,7 +313,7 @@ public:
   longlong val_int() { return value; }
   bool save_in_field(Field *to);
   String *val_str(String *str)
-  { str_value.set(buff,buff_length); return &str_value; }
+  { str_value.set(buff,buff_length,default_charset_info); return &str_value; }
   const char *func_name() const { return "now"; }
   void fix_length_and_dec();
   bool get_date(TIME *res,bool fuzzy_date);