diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-02-23 16:26:45 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-02-23 16:26:45 +0300 |
| commit | f0d2fe34f2bd074dfc0f9ae6c5ffbc414a6f9b59 (patch) | |
| tree | 906d61216e1d999772c7a2a993909fc6915a9ab0 /sql/item_sum.cc | |
| parent | 0afa209018fad0a0863048cebfcc8f0a52b814ee (diff) | |
| parent | 6f78ef71d485fb3968355941860d012fc17a9c59 (diff) | |
| download | mariadb-git-f0d2fe34f2bd074dfc0f9ae6c5ffbc414a6f9b59.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in client/mysqltest.cc
Text conflict in configure.in
Text conflict in mysql-test/include/mtr_warnings.sql
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 82b68a87dfd..c6ac8a05150 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3375,6 +3375,8 @@ 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 ")); @@ -3382,7 +3384,7 @@ void Item_func_group_concat::print(String *str, enum_query_type query_type) { if (i) str->append(','); - args[i]->print(str, query_type); + pargs[i]->print(str, query_type); } if (arg_count_order) { |