bk commit into 4.1 tree (evgen:1.2473)

[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.2473 05/10/13 00:16:33 evgen@stripped +2 -0
  Merge epotemkin@stripped:/home/bk/mysql-4.1
  into moonbone.local:/work/13535-bug-4.1-mysql

  mysql-test/t/select.test
    1.49 05/10/13 00:16:32 evgen@stripped +0 -0
    Auto merged

  mysql-test/r/select.result
    1.65 05/10/13 00:16:31 evgen@stripped +0 -0
    Auto merged

# 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/13535-bug-4.1-mysql/RESYNC

--- 1.64/mysql-test/r/select.result	2005-10-03 23:01:44 +04:00
+++ 1.65/mysql-test/r/select.result	2005-10-13 00:16:31 +04:00
@@ -2625,6 +2625,13 @@
 f1
 select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,NULL));
 f1
+insert into t1 values(1,1),(2,null);
+insert into t2 values(2);
+select * from t1,t2 where f1=f3 and (f1,f2) = (2,null);
+f1	f2	f3
+select * from t1,t2 where f1=f3 and (f1,f2) <=> (2,null);
+f1	f2	f3
+2	NULL	2
 drop table t1,t2;
 create table t1 (f1 int not null auto_increment primary key, f2 varchar(10));
 create table t11 like t1;

--- 1.48/mysql-test/t/select.test	2005-10-03 23:01:18 +04:00
+++ 1.49/mysql-test/t/select.test	2005-10-13 00:16:32 +04:00
@@ -2172,6 +2172,10 @@
 select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,1));
 select f1 from t1,t2 where f1=f2 and (f1,NULL) = ((1,1));
 select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,NULL));
+insert into t1 values(1,1),(2,null);
+insert into t2 values(2);
+select * from t1,t2 where f1=f3 and (f1,f2) = (2,null);
+select * from t1,t2 where f1=f3 and (f1,f2) <=> (2,null);
 drop table t1,t2; 
 
 #