1 files changed, 7 insertions, 4 deletions

diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 4358f14f08e..2b9bdfe9a1e 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -52,17 +52,19 @@ uint nr_of_decimals(const char *str)
 
 double Item_str_func::val()
 {
+  int err;
   String *res;
   res=val_str(&str_value);
   return res ? my_strntod(res->charset(), (char*) res->ptr(),res->length(),
-			  NULL) : 0.0;
+			  NULL, &err) : 0.0;
 }
 
 longlong Item_str_func::val_int()
 {
+  int err;
   String *res;
   res=val_str(&str_value);
-  return res ? my_strntoll(res->charset(),res->ptr(),res->length(),NULL,10) : (longlong) 0;
+  return res ? my_strntoll(res->charset(),res->ptr(),res->length(),10,NULL,&err) : (longlong) 0;
 }
 
 
@@ -1956,6 +1958,7 @@ String *Item_func_conv::val_str(String *str)
   longlong dec;
   int from_base= (int) args[1]->val_int();
   int to_base= (int) args[2]->val_int();
+  int err;
 
   if (args[0]->null_value || args[1]->null_value || args[2]->null_value ||
       abs(to_base) > 36 || abs(to_base) < 2 ||
@@ -1966,9 +1969,9 @@ String *Item_func_conv::val_str(String *str)
   }
   null_value=0;
   if (from_base < 0)
-    dec= my_strntoll(res->charset(),res->ptr(),res->length(),&endptr,-from_base);
+    dec= my_strntoll(res->charset(),res->ptr(),res->length(),-from_base,&endptr,&err);
   else
-    dec= (longlong) my_strntoull(res->charset(),res->ptr(),res->length(),&endptr,from_base);
+    dec= (longlong) my_strntoull(res->charset(),res->ptr(),res->length(),from_base,&endptr,&err);
   ptr= longlong2str(dec,ans,to_base);
   if (str->copy(ans,(uint32) (ptr-ans), thd_charset()))
     return &empty_string;