diff options
| author | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-10-16 13:24:54 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-10-16 13:24:54 +0300 |
| commit | fe4a68fb3cd4178b49c824b7a375e505e89e792a (patch) | |
| tree | 33ab2d08c472fe2b9dcbf3904fe634943d077973 /mysql-test/r/func_gconcat.result | |
| parent | b6248f76ed201d524ccc9b33cae2d961a0724c5e (diff) | |
| parent | 750a2a0b862ba6a02c341a6120a96a081a83ac4f (diff) | |
| download | mariadb-git-fe4a68fb3cd4178b49c824b7a375e505e89e792a.tar.gz | |
Merge macbook.gmz:/Users/kgeorge/mysql/work/B14019-4.1-opt
into macbook.gmz:/Users/kgeorge/mysql/work/B14019-5.0-opt
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
sql/sql_base.cc:
Auto merged
mysql-test/r/group_by.result:
merge 4.1->5.0
mysql-test/t/group_by.test:
merge 4.1->5.0
Diffstat (limited to 'mysql-test/r/func_gconcat.result')
| -rw-r--r-- | mysql-test/r/func_gconcat.result | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mysql-test/r/func_gconcat.result b/mysql-test/r/func_gconcat.result index 93925670d01..5dbbd891427 100644 --- a/mysql-test/r/func_gconcat.result +++ b/mysql-test/r/func_gconcat.result @@ -74,11 +74,6 @@ grp group_concat(c order by 1) 1 a 2 b,c 3 C,D,d,d,D,E -select grp,group_concat(c order by "c") from t1 group by grp; -grp group_concat(c order by "c") -1 a -2 b,c -3 C,D,d,d,D,E select grp,group_concat(distinct c order by c) from t1 group by grp; grp group_concat(distinct c order by c) 1 a |