bk commit into 4.1 tree (sergefp:1.2104)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
4.1 repository of psergey. When psergey 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.2104 05/03/11 02:23:16 sergefp@stripped +3 -0
  Merge

  mysql-test/t/join_outer.test
    1.17 05/03/11 02:23:15 sergefp@stripped +0 -0
    SCCS merged

  mysql-test/r/join_outer.result
    1.33 05/03/11 02:23:15 sergefp@stripped +0 -0
    SCCS merged

  sql/item_cmpfunc.h
    1.103 05/03/11 02:22:24 sergefp@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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-4.1-bug8711/RESYNC

--- 1.102/sql/item_cmpfunc.h	2005-01-24 15:25:40 +03:00
+++ 1.103/sql/item_cmpfunc.h	2005-03-11 02:22:24 +03:00
@@ -284,6 +284,7 @@
   Item_func_equal(Item *a,Item *b) :Item_bool_rowready_func2(a,b) {};
   longlong val_int();
   void fix_length_and_dec();
+  table_map not_null_tables() const { return 0; }
   enum Functype functype() const { return EQUAL_FUNC; }
   enum Functype rev_functype() const { return EQUAL_FUNC; }
   cond_result eq_cmp_result() const { return COND_TRUE; }

--- 1.32/mysql-test/r/join_outer.result	2004-11-06 09:10:42 +03:00
+++ 1.33/mysql-test/r/join_outer.result	2005-03-11 02:23:15 +03:00
@@ -683,6 +683,26 @@
 1	SIMPLE	t3	ALL	NULL	NULL	NULL	NULL	2	
 drop table t1, t2, t3;
 create table t1 (
+a int(11),
+b char(10),
+key (a)
+);
+insert into t1 (a) values (1),(2),(3),(4);
+create table t2 (a int);
+select * from t1 left join t2 on t1.a=t2.a where not (t2.a <=> t1.a);
+a	b	a
+1	NULL	NULL
+2	NULL	NULL
+3	NULL	NULL
+4	NULL	NULL
+select * from t1 left join t2 on t1.a=t2.a having not (t2.a <=> t1.a);
+a	b	a
+1	NULL	NULL
+2	NULL	NULL
+3	NULL	NULL
+4	NULL	NULL
+drop table t1,t2;
+create table t1 (
 match_id tinyint(3) unsigned not null auto_increment,
 home tinyint(3) unsigned default '0',
 unique key match_id (match_id),

--- 1.16/mysql-test/t/join_outer.test	2004-11-06 09:08:55 +03:00
+++ 1.17/mysql-test/t/join_outer.test	2005-03-11 02:23:15 +03:00
@@ -457,6 +457,19 @@
 
 drop table t1, t2, t3;
 
+# Test for BUG#8711 '<=>' was considered to be a NULL-rejecting predicate.
+create table t1 (
+  a int(11),
+  b char(10),
+  key (a)
+);
+insert into t1 (a) values (1),(2),(3),(4);
+create table t2 (a int);
+
+select * from t1 left join t2 on t1.a=t2.a where not (t2.a <=> t1.a);
+select * from t1 left join t2 on t1.a=t2.a having not (t2.a <=> t1.a);
+drop table t1,t2;
+
 # Test for BUG#5088
 
 create table t1 (