diff options
| author | bell@sanja.is.com.ua <> | 2004-02-14 13:31:39 +0200 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2004-02-14 13:31:39 +0200 |
| commit | 44b37b089adbcef7efa8a9030732c4689e3a42ed (patch) | |
| tree | 5a43e43d6a139a343cb71c89c1209240d9287db0 /sql/item_sum.h | |
| parent | f20b775c63f4faa2a322c9746762ff20ad02805b (diff) | |
| parent | 50fb56399a9284599b550f9a96072108a2c42536 (diff) | |
| download | mariadb-git-44b37b089adbcef7efa8a9030732c4689e3a42ed.tar.gz | |
merge
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 06989f30ae5..840ed1d1f7d 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -738,7 +738,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(); @@ -750,7 +750,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() { |