diff options
| author | serg@serg.mylan <> | 2004-02-13 15:27:21 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2004-02-13 15:27:21 +0100 |
| commit | 5914e5705c62e065d52754d2e33f7224398d3e0e (patch) | |
| tree | e72eb3285c6d77bd43ee040603595ce715626551 /sql/item_sum.h | |
| parent | 67fbc4d2b70ffeab70d547a59e2d9af05c8e3d41 (diff) | |
| download | mariadb-git-5914e5705c62e065d52754d2e33f7224398d3e0e.tar.gz | |
my_atof is deleted
strtod from mit-threads is restored and cleaned up
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() { |