All String->set() now have charset argument

1 files changed, 4 insertions, 4 deletions

diff --git a/sql/procedure.h b/sql/procedure.h
index 349908a8d84..3792d823b12 100644
--- a/sql/procedure.h
+++ b/sql/procedure.h
@@ -62,7 +62,7 @@ public:
   { value=atof(str); }
   double val() { return value; }
   longlong val_int() { return (longlong) value; }
-  String *val_str(String *s) { s->set(value,decimals); return s; }
+  String *val_str(String *s) { s->set(value,decimals,my_thd_charset); return s; }
   unsigned int size_of() { return sizeof(*this);}  
 };
 
@@ -80,7 +80,7 @@ public:
   { value=strtoll(str,NULL,10); }
   double val() { return (double) value; }
   longlong val_int() { return value; }
-  String *val_str(String *s) { s->set(value); return s; }
+  String *val_str(String *s) { s->set(value, my_thd_charset); return s; }
   unsigned int size_of() { return sizeof(*this);}  
 };
 
@@ -92,8 +92,8 @@ public:
     { this->max_length=length; }
   enum Item_result result_type () const { return STRING_RESULT; }
   enum_field_types field_type() const { return FIELD_TYPE_STRING; }
-  void set(double nr) { str_value.set(nr); }
-  void set(longlong nr) { str_value.set(nr); }
+  void set(double nr) { str_value.set(nr, 2, my_thd_charset); }
+  void set(longlong nr) { str_value.set(nr, my_thd_charset); }
   void set(const char *str, uint length) { str_value.copy(str,length); }
   double val() { return atof(str_value.ptr()); }
   longlong val_int() { return strtoll(str_value.ptr(),NULL,10); }