strnto family functions now return error in a new argument

1 files changed, 4 insertions, 2 deletions

diff --git a/sql/item_sum.h b/sql/item_sum.h
index ffc9558822d..c49311082e8 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -483,14 +483,16 @@ public:
   String *val_str(String *);
   double val()
   {
+    int err;
     String *res;  res=val_str(&str_value);
     return res ? my_strntod(res->charset(),(char*) res->ptr(),res->length(),
-			    (char**) 0) : 0.0;
+			    (char**) 0, &err) : 0.0;
   }
   longlong val_int()
   {
+    int err;
     String *res;  res=val_str(&str_value);
-    return res ? my_strntoll(res->charset(),res->ptr(),res->length(),(char**) 0,10) : (longlong) 0;
+    return res ? my_strntoll(res->charset(),res->ptr(),res->length(),10, (char**) 0, &err) : (longlong) 0;
   }
   enum Item_result result_type () const { return STRING_RESULT; }
   void fix_length_and_dec();