Commit a952b3fc authored by unknown's avatar unknown
Browse files

fixed merge

parent de5b4eba

mysql-test/r/func_group.result

+1 −1
Original line number Diff line number Diff line
@@ -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