summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/item.h b/sql/item.h
index 2503f137355..6857b4acf82 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -877,9 +877,10 @@ public:
double val_real()
{
DBUG_ASSERT(fixed == 1);
- int err;
+ int err_not_used;
+ 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_not_used);
}
longlong val_int()
{
@@ -1230,10 +1231,11 @@ public:
enum_field_types field_type() const { return cached_field_type; }
double val_real()
{
- int err;
+ int err_not_used;
+ 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_not_used));
}
longlong val_int()
{