summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-09-05 17:12:25 +0200
committerunknown <msvensson@neptunus.(none)>2005-09-05 17:12:25 +0200
commit441d80a5b8aaf833f3817e534a2e3987e89714ed (patch)
treeabd25426a6d46ab9ef86969ff82a3c6568d13d45 /mysql-test
parente54b1fd87f1e17804a1e2aae4cfbd52e82438d93 (diff)
parentc9415fd44cd89c8953443c944309ea475a10cade (diff)
downloadmariadb-git-441d80a5b8aaf833f3817e534a2e3987e89714ed.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/func_gconcat.result9
-rw-r--r--mysql-test/t/func_gconcat.test8
2 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/r/func_gconcat.result b/mysql-test/r/func_gconcat.result
index a6c25fcd26c..12bc5ca2582 100644
--- a/mysql-test/r/func_gconcat.result
+++ b/mysql-test/r/func_gconcat.result
@@ -551,3 +551,12 @@ DROP TABLE t1,t2;
select * from (select group_concat('c') from DUAL) t;
group_concat('c')
NULL
+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
+1
+drop table t1;
diff --git a/mysql-test/t/func_gconcat.test b/mysql-test/t/func_gconcat.test
index 827a2813718..9e003d19ab9 100644
--- a/mysql-test/t/func_gconcat.test
+++ b/mysql-test/t/func_gconcat.test
@@ -348,4 +348,12 @@ DROP TABLE t1,t2;
#
select * from (select group_concat('c') from DUAL) t;
+#
+# Bug #12859 group_concat in subquery cause incorrect not null
+#
+create table t1 ( a int not null default 0);
+select * from (select group_concat(a) from t1) t2;
+select group_concat('x') UNION ALL select 1;
+drop table t1;
+
# End of 4.1 tests