summaryrefslogtreecommitdiff
path: root/sql/item_func.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/item_func.h')
-rw-r--r--sql/item_func.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/item_func.h b/sql/item_func.h
index 8a5347d675e..2738c7419ca 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -828,8 +828,11 @@ public:
double val()
{
int err;
- String *res; res=val_str(&str_value);
- return res ? my_strntod(res->charset(),(char*) res->ptr(),res->length(),0,&err) : 0.0;
+ String *res;
+ char *end_not_used;
+ res=val_str(&str_value);
+ return res ? my_strntod(res->charset(), (char*) res->ptr(), res->length(),
+ &end_not_used, &err) : 0.0;
}
longlong val_int()
{