summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/item.h b/sql/item.h
index dd06d4ce61a..97e2b0c0945 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -719,8 +719,9 @@ public:
{
DBUG_ASSERT(fixed == 1);
int err;
+ char *end_not_used;
return my_strntod(str_value.charset(), (char*) str_value.ptr(),
- str_value.length(), (char**) 0, &err);
+ str_value.length(), &end_not_used, &err);
}
longlong val_int()
{
@@ -1044,9 +1045,10 @@ public:
double val()
{
int err;
+ char *end_not_used;
return (null_value ? 0.0 :
my_strntod(str_value.charset(), (char*) str_value.ptr(),
- str_value.length(),NULL,&err));
+ str_value.length(), &end_not_used, &err));
}
longlong val_int()
{