diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-11-26 16:32:51 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-11-26 16:32:51 +0200 |
| commit | 96d45ed2f64f83a53a4d9a4267cb93ea14c9f7ca (patch) | |
| tree | 74a1415aa93abdbe676036e4386aadf2b13ea031 /sql/item_sum.cc | |
| parent | 7d27f9c0cace2adaaf95bfef456e2dd41a408e08 (diff) | |
| parent | c5987223db0158389602e57c25c13368aad80b34 (diff) | |
| download | mariadb-git-96d45ed2f64f83a53a4d9a4267cb93ea14c9f7ca.tar.gz | |
merge
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index b6e5d6d3182..8cd8e1bb222 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3395,8 +3395,6 @@ String* Item_func_group_concat::val_str(String* str) void Item_func_group_concat::print(String *str, enum_query_type query_type) { - /* orig_args is not filled with valid values until fix_fields() */ - Item **pargs= fixed ? orig_args : args; str->append(STRING_WITH_LEN("group_concat(")); if (distinct) str->append(STRING_WITH_LEN("distinct ")); @@ -3404,7 +3402,7 @@ void Item_func_group_concat::print(String *str, enum_query_type query_type) { if (i) str->append(','); - pargs[i]->print(str, query_type); + orig_args[i]->print(str, query_type); } if (arg_count_order) { @@ -3413,7 +3411,7 @@ void Item_func_group_concat::print(String *str, enum_query_type query_type) { if (i) str->append(','); - pargs[i + arg_count_field]->print(str, query_type); + orig_args[i + arg_count_field]->print(str, query_type); if (order[i]->asc) str->append(STRING_WITH_LEN(" ASC")); else |