diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-04-07 11:04:46 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-04-07 11:04:46 +0200 |
| commit | f3de57d982df777be94d4952a0545854e75f1509 (patch) | |
| tree | a0b486292d922e6ecc339c4bb79709616433feca /sql/item_sum.cc | |
| parent | 224b63e3782fcf66c365f3d297985ecca0b2cccd (diff) | |
| parent | 2f2607faeffb09d946e09a5f090a24449e73742b (diff) | |
| download | mariadb-git-f3de57d982df777be94d4952a0545854e75f1509.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 1cd1741cea6..8826144266e 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3226,7 +3226,10 @@ Item_func_group_concat::fix_fields(THD *thd, Item **ref) } if (agg_item_charsets(collation, func_name(), - args, arg_count, MY_COLL_ALLOW_CONV)) + args, + /* skip charset aggregation for order columns */ + arg_count - arg_count_order, + MY_COLL_ALLOW_CONV)) return 1; result.set_charset(collation.collation); |