bk commit into 4.1 tree (evgen:1.2470)

[eugene]

Below is the list of changes that have just been committed into a local
4.1 repository of evgen. When evgen 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
  1.2470 05/10/27 18:36:11 evgen@stripped +1 -0
  select.result:
    After merge fix

  mysql-test/r/select.result
    1.70 05/10/27 18:35:50 evgen@stripped +8 -8
    After merge fix

# 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:	evgen
# Host:	moonbone.local
# Root:	/work/13855-bug-4.1-mysql

--- 1.69/mysql-test/r/select.result	2005-10-27 17:44:26 +04:00
+++ 1.70/mysql-test/r/select.result	2005-10-27 18:35:50 +04:00
@@ -2400,14 +2400,6 @@
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	
 1	SIMPLE	t2	ref	a	a	23	test.t1.a	2	
 DROP TABLE t1, t2;
-create table t1 (f1 int primary key, f2 int);
-create table t2 (f3 int, f4 int, primary key(f3,f4));
-insert into t1 values (1,1);
-insert into t2 values (1,1),(1,2);
-select distinct count(f2) >0 from t1 left join t2 on f1=f3 group by f1;
-count(f2) >0
-1
-drop table t1,t2;
 CREATE TABLE t1 ( city char(30) );
 INSERT INTO t1 VALUES ('London');
 INSERT INTO t1 VALUES ('Paris');
@@ -2706,3 +2698,11 @@
 1	2	2	1
 1	2	3	1
 DROP TABLE IF EXISTS t1, t2;
+create table t1 (f1 int primary key, f2 int);
+create table t2 (f3 int, f4 int, primary key(f3,f4));
+insert into t1 values (1,1);
+insert into t2 values (1,1),(1,2);
+select distinct count(f2) >0 from t1 left join t2 on f1=f3 group by f1;
+count(f2) >0
+1
+drop table t1,t2;