diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-10-10 17:18:36 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-10-10 17:18:36 +0400 |
| commit | e32f277c615c566d7b1654be473da40134693d96 (patch) | |
| tree | c881185e4a66dc674d6e798f91b22b8027ec5f16 /mysql-test/t/func_gconcat.test | |
| parent | d4553e35586398a89b005bff0d55280ce237483e (diff) | |
| parent | 3177e8ebc49d95bb9c7768e5fc6aceb66bbb1783 (diff) | |
| download | mariadb-git-e32f277c615c566d7b1654be473da40134693d96.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21354
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.
sql/item_sum.h:
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 98c21986aa9..89a4a04cf3e 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); |