diff options
| author | unknown <igor@rurik.mysql.com> | 2005-11-02 22:24:36 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-11-02 22:24:36 -0800 |
| commit | 2b1652046d1e1a4d2046fce919461aadf5f08be4 (patch) | |
| tree | 47d43a3ed7dd86d28c8b3c7af35ce32964b8fd24 /sql | |
| parent | 3e2e44f044e51d51c5d6b00f94431d527e0a7cc1 (diff) | |
| parent | e2220f476680d60a5f35b9dcef6920862d578f80 (diff) | |
| download | mariadb-git-2b1652046d1e1a4d2046fce919461aadf5f08be4.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
mysql-test/r/view.result:
Manual merge.
mysql-test/t/view.test:
Manual merge.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_sum.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index b56d99cf245..b2eaf39d624 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3173,6 +3173,10 @@ void Item_func_group_concat::print(String *str) if (i) str->append(','); (*order[i]->item)->print(str); + if (order[i]->asc) + str->append(" ASC"); + else + str->append(" DESC"); } } str->append(" separator \'", 12); |