diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_sum.h | 2 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 42d46876d27..1b3e993fffc 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -697,6 +697,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; } + void fix_length_and_dec() { max_length=group_concat_max_len; } virtual Item_result result_type () const { return STRING_RESULT; } void reset(); bool add(); @@ -715,4 +716,5 @@ class Item_func_group_concat : public Item_sum return res ? strtoll(res->c_ptr(),(char**) 0,10) : (longlong) 0; } String* val_str(String* str); + Item *copy_or_same(THD* thd) { return new Item_func_group_concat(thd, *this); } }; diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 189a28aea51..745d0a8e7d2 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2588,7 +2588,7 @@ opt_distinct: |DISTINCT { $$ = 1; }; opt_gconcat_separator: - /* empty */ { $$ = new String(" ",1,default_charset_info); } + /* empty */ { $$ = new String(",",1,default_charset_info); } |SEPARATOR_SYM text_string { $$ = $2; }; |