diff options
author | unknown <kostja@bodhi.local> | 2006-10-23 11:51:45 +0400 |
---|---|---|
committer | unknown <kostja@bodhi.local> | 2006-10-23 11:51:45 +0400 |
commit | 07cf5b9bd349f799bc0e81caf79edfbd29fd0512 (patch) | |
tree | 8975cf9bcdde83b55d94ab5299cb5d61a93acb9c /mysql-test/t/func_gconcat.test | |
parent | 8db4dc3f91dfbe03181e63ed45bdf35a5d65aeb0 (diff) | |
parent | 133e91aa89e05437158946c0a3b7f7d2f27a0f6d (diff) | |
download | mariadb-git-07cf5b9bd349f799bc0e81caf79edfbd29fd0512.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/r/view.result:
Manual merge.
mysql-test/t/view.test:
Manual merge.
Diffstat (limited to 'mysql-test/t/func_gconcat.test')
-rw-r--r-- | mysql-test/t/func_gconcat.test | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/t/func_gconcat.test b/mysql-test/t/func_gconcat.test index b8015c9dbc4..769f10277d4 100644 --- a/mysql-test/t/func_gconcat.test +++ b/mysql-test/t/func_gconcat.test @@ -32,7 +32,6 @@ select grp,group_concat(d order by a desc) from t1 group by grp; select grp,group_concat(a order by a,d+c-ascii(c)-a) from t1 group by grp; select grp,group_concat(a order by d+c-ascii(c),a) from t1 group by grp; select grp,group_concat(c order by 1) from t1 group by grp; -select grp,group_concat(c order by "c") from t1 group by grp; select grp,group_concat(distinct c order by c) from t1 group by grp; select grp,group_concat(distinct c order by c desc) from t1 group by grp; explain extended select grp,group_concat(distinct c order by c desc) from t1 group by grp; |