diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2010-02-19 19:06:47 +0000 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2010-02-19 19:06:47 +0000 |
| commit | 60a114d838278797bce949be4fd7b8acc9f7ef64 (patch) | |
| tree | ca01d689dff2d01fe5f03cdac4803c238a0a93d5 /sql | |
| parent | 141bb7d144e093c860f2183abf220875ee681930 (diff) | |
| parent | 1fc1f462b6d469d7b1f2bb94ba99f4554ced1cd5 (diff) | |
| download | mariadb-git-60a114d838278797bce949be4fd7b8acc9f7ef64.tar.gz | |
manual merge
Diffstat (limited to 'sql')
| -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 4ab8e75ddf5..142e90639e8 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3402,6 +3402,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 ")); @@ -3409,7 +3411,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) { |