More use of new str->number routines

1 files changed, 8 insertions, 2 deletions

diff --git a/sql/item.h b/sql/item.h
index a189789ba24..4dff0591c09 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -370,8 +370,14 @@ public:
   }
   ~Item_string() {}
   enum Type type() const { return STRING_ITEM; }
-  double val() { return atof(str_value.ptr()); }
-  longlong val_int() { return strtoll(str_value.ptr(),(char**) 0,10); }
+  double val()
+  { 
+    return my_strntod(str_value.charset(),str_value.ptr(),str_value.length(),(char**)NULL);
+  }
+  longlong val_int()
+  {
+    return my_strntoll(str_value.charset(),str_value.ptr(),str_value.length(),(char**) 0,10);
+  }
   String *val_str(String*) { return (String*) &str_value; }
   int save_in_field(Field *field, bool no_conversions);
   void make_field(Send_field *field);