fixed merge

8577d791 · gkodinov/kgeorge@rakia.(none) · 2da037c7 · 8577d791
Commit 8577d791 authored Sep 20, 2006 by gkodinov/kgeorge@rakia.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/r/func_group.result mysql-test/r/func_group.result +1 -1

No files found.
--- 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