summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2005-11-03 08:42:02 +0100
committermsvensson@neptunus.(none) <>2005-11-03 08:42:02 +0100
commit25f5062886e636e753ca199684ac8dc6f001bd26 (patch)
tree2dee9ff93eda63d81c8cf7c620ef257cc2236a2a /sql
parentce502088146f6b2010a8f0de1203174f504e2efc (diff)
parent69d985cc9d251c5bc16c8f06691b67bef52a35e0 (diff)
downloadmariadb-git-25f5062886e636e753ca199684ac8dc6f001bd26.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
Diffstat (limited to 'sql')
-rw-r--r--sql/item_sum.cc4
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);