bk commit into 5.1 tree (gkodinov:1.2510)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 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, 2007-05-04 17:33:41+03:00, gkodinov@stripped +1 -0
  post merge (5.0-opt -> 5.1-opt) fixes

  mysql-test/r/subselect.result@stripped, 2007-05-04 17:33:39+03:00, gkodinov@stripped +0
-1
    post merge (5.0-opt -> 5.1-opt) fixes

# 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:	magare.gmz
# Root:	/home/kgeorge/mysql/work/B27531-5.1-opt

--- 1.184/mysql-test/r/subselect.result	2007-05-04 16:37:28 +03:00
+++ 1.185/mysql-test/r/subselect.result	2007-05-04 17:33:39 +03:00
@@ -4042,7 +4042,6 @@ id	select_type	table	type	possible_keys	
 2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort
 DROP TABLE t1;
 End of 5.0 tests.
-End of 5.0 tests.
 CREATE TABLE t1 (a int, b int);
 INSERT INTO t1 VALUES (2,22),(1,11),(2,22);
 SELECT a FROM t1 WHERE (SELECT COUNT(b) FROM DUAL) > 0 GROUP BY a;