Merge 5.5 -> 10.0-base

1 files changed, 18 insertions, 0 deletions

diff --git a/sql/item.cc b/sql/item.cc
index 26c75ccfd40..f1968e952be 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -263,6 +263,24 @@ String *Item::val_str_ascii(String *str)
 }
 
 
+String *Item::val_str(String *str, String *converter, CHARSET_INFO *cs)
+{
+  String *res= val_str(str);
+  if (null_value)
+    return (String *) 0;
+
+  if (!cs)
+    return res;
+
+  uint errors;
+  if ((null_value= converter->copy(res->ptr(), res->length(),
+                                   collation.collation, cs,  &errors)))
+    return (String *) 0;
+
+  return converter;
+}
+
+
 String *Item::val_string_from_real(String *str)
 {
   double nr= val_real();