summaryrefslogtreecommitdiff
path: root/sql/item_sum.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-02-22 12:51:23 +0200
committermonty@mysql.com <>2005-02-22 12:51:23 +0200
commite2dc9b4099b12ade3553498b9929928c0598de49 (patch)
treeaf26a8ec65a080dd408d6df18990ff71c50577aa /sql/item_sum.h
parentb902a66e274f999d078af43804a8e1e109e5fe36 (diff)
downloadmariadb-git-e2dc9b4099b12ade3553498b9929928c0598de49.tar.gz
Backport my_strntod() from 5.0
Change string->float conversion to delay division as long as possible. This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740)
Diffstat (limited to 'sql/item_sum.h')
-rw-r--r--sql/item_sum.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h
index d1e82387944..dab136e4716 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -600,9 +600,11 @@ public:
double val()
{
int err;
- String *res; res=val_str(&str_value);
+ char *end_not_used;
+ String *res;
+ res=val_str(&str_value);
return res ? my_strntod(res->charset(),(char*) res->ptr(),res->length(),
- (char**) 0, &err) : 0.0;
+ &end_not_used, &err) : 0.0;
}
longlong val_int()
{