summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2002-11-28 11:33:04 +0400
committerunknown <bar@bar.mysql.r18.ru>2002-11-28 11:33:04 +0400
commit5a1b9e1d05ec4c52e89df1adf40312a55f8b7d3f (patch)
treedd9966f4cc6d7de8de70f8bde3bc34b9e9afb096 /sql/item_sum.cc
parente761be558d6e40db17734f1425372dd228404e5e (diff)
downloadmariadb-git-5a1b9e1d05ec4c52e89df1adf40312a55f8b7d3f.tar.gz
More use of new string->number conversion functions
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r--sql/item_sum.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 567b5ee6ffa..86c94e03acd 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -334,7 +334,7 @@ double Item_sum_hybrid::val()
switch (hybrid_type) {
case STRING_RESULT:
String *res; res=val_str(&str_value);
- return res ? atof(res->c_ptr()) : 0.0;
+ return res ? my_strntod(res->charset(),res->ptr(),res->length(),(char**)0) : 0.0;
case INT_RESULT:
if (unsigned_flag)
return ulonglong2double(sum_int);