bk commit into 5.0 tree (gkodinov:1.2274)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-20 12:02:58+03:00, gkodinov@rakia.(none) +1 -0
  fixed merge

  mysql-test/r/func_group.result@stripped, 2006-09-20 12:02:35+03:00, gkodinov@rakia.(none) +1
-1
    fixed merge

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gkodinov
# Host:	rakia.(none)
# Root:	/home/kgeorge/mysql/autopush/B21540-5.0-opt

--- 1.52/mysql-test/r/func_group.result	2006-09-20 12:03:05 +03:00
+++ 1.53/mysql-test/r/func_group.result	2006-09-20 12:03:05 +03:00
@@ -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