summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_group.result
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@rakia.(none)>2006-09-20 12:02:58 +0300
committerunknown <gkodinov/kgeorge@rakia.(none)>2006-09-20 12:02:58 +0300
commita952b3fcb21cd09ab00775d10d440cf8df0c48dd (patch)
tree37ac51416ac1d3b600f9d2a44f4f65c93197b6ae /mysql-test/r/func_group.result
parentde5b4eba916e0c2a547e91235f492388e14177fe (diff)
downloadmariadb-git-a952b3fcb21cd09ab00775d10d440cf8df0c48dd.tar.gz
fixed merge
Diffstat (limited to 'mysql-test/r/func_group.result')
-rw-r--r--mysql-test/r/func_group.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result
index 32d6931c334..c6117053a60 100644
--- a/mysql-test/r/func_group.result
+++ b/mysql-test/r/func_group.result
@@ -860,8 +860,8 @@ CREATE TABLE t1 (a INT, b INT);
INSERT INTO t1 VALUES (1,1),(1,2),(2,3);
SELECT (SELECT COUNT(DISTINCT t1.b)) FROM t1 GROUP BY t1.a;
(SELECT COUNT(DISTINCT t1.b))
-0
2
+1
SELECT (SELECT COUNT(DISTINCT 12)) FROM t1 GROUP BY t1.a;
(SELECT COUNT(DISTINCT 12))
1