diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-02-14 13:31:39 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-02-14 13:31:39 +0200 |
| commit | 6826a55b1da73770ce067972efafc00f9d2f6670 (patch) | |
| tree | 5a43e43d6a139a343cb71c89c1209240d9287db0 /sql/item_sum.h | |
| parent | fab7113f8398ba41d5e54e32dc0b3259a6297dfc (diff) | |
| parent | 4ec12a5e55d5f2db27a5c0ce93c7e74254d652a4 (diff) | |
| download | mariadb-git-6826a55b1da73770ce067972efafc00f9d2f6670.tar.gz | |
merge
sql/item.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
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() { |