diff options
| author | unknown <serg@serg.mylan> | 2004-02-13 15:27:21 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-02-13 15:27:21 +0100 |
| commit | 1515c12191bcb50c49512475a72c04a47c963a07 (patch) | |
| tree | e72eb3285c6d77bd43ee040603595ce715626551 /sql/item_sum.h | |
| parent | c5bc73e9a7d2f4ed2c7602fc6a028e227c08b9f4 (diff) | |
| download | mariadb-git-1515c12191bcb50c49512475a72c04a47c963a07.tar.gz | |
my_atof is deleted
strtod from mit-threads is restored and cleaned up
BitKeeper/deleted/.del-atof.c~d3edf47a9884080:
Delete: strings/atof.c
configure.in:
atod() is no longer used in MySQL
isinf() now is
include/m_string.h:
my_strtod, my_atof
include/my_global.h:
my_atof is deleted
define isinf()
libmysql/Makefile.shared:
use internal strtod
sql/gstream.cc:
use internal strtod
sql/init.cc:
my_atof is deleted
sql/item.h:
use internal strtod
sql/item_func.cc:
use internal strtod
sql/item_sum.h:
use internal strtod
sql/sql_analyse.cc:
use internal strtod
strings/Makefile.am:
use internal strtod
strings/ctype-simple.c:
use internal strtod
strings/ctype-ucs2.c:
use internal strtod
strings/strtod.c:
cleanup
stricter input checks (e.g. ".E10" is no longer a number)
don't return an "inf"
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index dc84e4d4ab7..1435128af33 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -735,7 +735,7 @@ class Item_func_group_concat : public Item_sum enum Sumfunctype sum_func () const {return GROUP_CONCAT_FUNC;} const char *func_name() const { return "group_concat"; } - enum Type type() const { return SUM_FUNC_ITEM; } + enum Type type() const { return SUM_FUNC_ITEM; } virtual Item_result result_type () const { return STRING_RESULT; } void clear(); bool add(); @@ -747,7 +747,7 @@ class Item_func_group_concat : public Item_sum double val() { String *res; res=val_str(&str_value); - return res ? atof(res->c_ptr()) : 0.0; + return res ? my_atof(res->c_ptr()) : 0.0; } longlong val_int() { |