diff options
| author | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-09-05 17:09:12 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-09-05 17:09:12 +0300 |
| commit | 2aeec864e29066c8cf42664da37a77bd601767de (patch) | |
| tree | 336348c859d3cf4c763c2471094d0b350624a0f9 /mysql-test/r/func_gconcat.result | |
| parent | 09df2612b2b9eade2b1e808a28cf9b534d7240b1 (diff) | |
| parent | d3dd6fa0084d6c89b71cb7d700a164a9f6e0da87 (diff) | |
| download | mariadb-git-2aeec864e29066c8cf42664da37a77bd601767de.tar.gz | |
Merge macbook.gmz:/Users/kgeorge/mysql/work/B16792-4.1-opt
into macbook.gmz:/Users/kgeorge/mysql/work/B16792-5.0-opt
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/opt_sum.cc:
Auto merged
mysql-test/r/func_group.result:
merge 4.1->5.0 for bug #16792
mysql-test/t/func_group.test:
merge 4.1->5.0 for bug #16792
sql/sql_select.cc:
merge 4.1->5.0 for bug #16792
Diffstat (limited to 'mysql-test/r/func_gconcat.result')
| -rw-r--r-- | mysql-test/r/func_gconcat.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_gconcat.result b/mysql-test/r/func_gconcat.result index dc09a68682c..6617ccc671e 100644 --- a/mysql-test/r/func_gconcat.result +++ b/mysql-test/r/func_gconcat.result @@ -566,14 +566,14 @@ COUNT(*) GROUP_CONCAT(DISTINCT t2.somename SEPARATOR ' |') DROP TABLE t1,t2; select * from (select group_concat('c') from DUAL) t; group_concat('c') -NULL +c create table t1 ( a int not null default 0); select * from (select group_concat(a) from t1) t2; group_concat(a) NULL select group_concat('x') UNION ALL select 1; group_concat('x') -NULL +x 1 drop table t1; CREATE TABLE t1 (id int, a varchar(9)); |