diff options
author | unknown <kroki/tomash@moonlight.intranet> | 2006-10-10 18:11:10 +0400 |
---|---|---|
committer | unknown <kroki/tomash@moonlight.intranet> | 2006-10-10 18:11:10 +0400 |
commit | 2540481ed190f03739b52a81a63474f90ad642e0 (patch) | |
tree | f445a22e6778a0b2d19b2197ae28deabb03d4c48 /mysql-test/t/func_gconcat.test | |
parent | c62dc96e484d698c2b76e27c1a2fba82ffbd18c9 (diff) | |
parent | f07c86e20b2676070d45fab23cfee5e4e16d6760 (diff) | |
download | mariadb-git-2540481ed190f03739b52a81a63474f90ad642e0.tar.gz |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21354
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_sum.cc:
Auto merged
mysql-test/r/ps.result:
Manual merge.
mysql-test/t/ps.test:
Manual merge.
Diffstat (limited to 'mysql-test/t/func_gconcat.test')
-rw-r--r-- | mysql-test/t/func_gconcat.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/func_gconcat.test b/mysql-test/t/func_gconcat.test index b5c468e1638..b8015c9dbc4 100644 --- a/mysql-test/t/func_gconcat.test +++ b/mysql-test/t/func_gconcat.test @@ -99,7 +99,7 @@ select ifnull(group_concat(concat(t1.id, ':', t1.name)), 'shortname') as 'withou select distinct ifnull(group_concat(concat(t1.id, ':', t1.name)), 'shortname') as 'with distinct: cutoff at length of shortname' from t1; drop table t1; -# check zero rows +# check zero rows (bug#836) create table t1(id int); create table t2(id int); insert into t1 values(0),(1); |