diff options
| author | unknown <mskold@mysql.com> | 2005-01-21 08:43:41 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-01-21 08:43:41 +0100 |
| commit | 5c52b71d4872ae556d9f4f087f6ff9e0d0074f1e (patch) | |
| tree | 98550be0e92e345e463c3f159d07fb888eadeabb /sql/item.h | |
| parent | 78edb8a569e33ae8f7957240166c0a5eef9f0347 (diff) | |
| parent | 205c24279aea5a4edd5130d5c533fb7553f3fad2 (diff) | |
| download | mariadb-git-5c52b71d4872ae556d9f4f087f6ff9e0d0074f1e.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
sql/filesort.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/item.h b/sql/item.h index d70e55b094f..c8b2d774696 100644 --- a/sql/item.h +++ b/sql/item.h @@ -888,9 +888,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() { @@ -1241,10 +1242,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() { |