bk commit into 5.0 tree (evgen:1.2013)

[eugene]

Below is the list of changes that have just been committed into a local
5.0 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.2013 06/01/13 14:30:20 evgen@stripped +3 -0
  Merge epotemkin@stripped:/home/bk/mysql-5.0
  into moonbone.local:/work/15538-bug-5.0-mysql

  sql/sql_yacc.yy
    1.447 06/01/13 14:30:19 evgen@stripped +0 -0
    Auto merged

  mysql-test/t/select.test
    1.96 06/01/13 14:30:19 evgen@stripped +0 -0
    Auto merged

  mysql-test/r/select.result
    1.117 06/01/13 14:30:19 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/15538-bug-5.0-mysql/RESYNC

--- 1.446/sql/sql_yacc.yy	2006-01-11 23:36:13 +03:00
+++ 1.447/sql/sql_yacc.yy	2006-01-13 14:30:19 +03:00
@@ -9103,6 +9103,8 @@
 	  bzero((char *)&lex->sp_chistics, sizeof(st_sp_chistics));
 	  lex->sphead->m_chistics= &lex->sp_chistics;
 	  lex->sphead->m_body_begin= lex->ptr;
+          while (my_isspace(system_charset_info, lex->sphead->m_body_begin[0]))
+            ++lex->sphead->m_body_begin;
 	}
 	sp_proc_stmt
 	{

--- 1.116/mysql-test/r/select.result	2006-01-11 23:37:18 +03:00
+++ 1.117/mysql-test/r/select.result	2006-01-13 14:30:19 +03:00
@@ -3337,6 +3337,19 @@
 1	SIMPLE	t2	const	PRIMARY	PRIMARY	4	const	1	Using index
 1	SIMPLE	t3	const	PRIMARY	PRIMARY	8	const,const	1	
 DROP TABLE t1,t2,t3;
+create table t1 (f1 int unique);
+create table t2 (f2 int unique);
+create table t3 (f3 int unique);
+insert into t1 values(1),(2);
+insert into t2 values(1),(2);
+insert into t3 values(1),(NULL);
+select * from t3 where f3 is null;
+f3
+NULL
+select t2.f2 from t1 left join t2 on f1=f2 join t3 on f1=f3 where f1=1;
+f2
+1
+drop table t1,t2,t3;
 create table t1(f1 char, f2 char not null);
 insert into t1 values(null,'a');
 create table t2 (f2 char not null);

--- 1.95/mysql-test/t/select.test	2006-01-11 23:37:50 +03:00
+++ 1.96/mysql-test/t/select.test	2006-01-13 14:30:19 +03:00
@@ -2807,6 +2807,20 @@
 DROP TABLE t1,t2,t3;
 
 #
+# Bug #15633 Evaluation of Item_equal for non-const table caused wrong
+#            select result
+#
+create table t1 (f1 int unique);
+create table t2 (f2 int unique);
+create table t3 (f3 int unique);
+insert into t1 values(1),(2);
+insert into t2 values(1),(2);
+insert into t3 values(1),(NULL);
+select * from t3 where f3 is null;
+select t2.f2 from t1 left join t2 on f1=f2 join t3 on f1=f3 where f1=1;
+drop table t1,t2,t3;
+
+#
 # Bug#15268 Unchecked null value caused server crash
 #
 create table t1(f1 char, f2 char not null);