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 16:06:09 evgen@stripped +3 -0
  Merge

  mysql-test/t/select.test
    1.96 06/01/13 16:05:20 evgen@stripped +0 -0
    SCCS merged

  mysql-test/r/select.result
    1.117 06/01/13 16:05:20 evgen@stripped +0 -0
    SCCS merged

  sql/sql_select.cc
    1.384 06/01/13 15:59:34 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:	sunlight.local
# Root:	/work_local/15347-bug-5.0-mysql/RESYNC

--- 1.383/sql/sql_select.cc	2006-01-12 21:28:18 +03:00
+++ 1.384/sql/sql_select.cc	2006-01-13 15:59:34 +03:00
@@ -9896,6 +9896,7 @@
   int error;
   READ_RECORD *info;
 
+  join_tab->table->null_row= 0;
   if (!join_tab->cache.records)
     return NESTED_LOOP_OK;                      /* Nothing to do */
   if (skip_last)

--- 1.116/mysql-test/r/select.result	2006-01-13 12:13:49 +03:00
+++ 1.117/mysql-test/r/select.result	2006-01-13 16:05:20 +03:00
@@ -3337,6 +3337,17 @@
 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);
+insert into t1 values(1),(2);
+create table t2 (f2 int, f3 int, key(f2));
+insert into t2 values(1,1),(2,2);
+create table t3 (f4 int not null);
+insert into t3 values (2),(2),(2);
+select f1,(select count(*) from t2,t3 where f2=f1 and f3=f4) as count from t1;
+f1	count
+1	0
+2	3
+drop table t1,t2,t3;
 create table t1 (f1 int unique);
 create table t2 (f2 int unique);
 create table t3 (f3 int unique);

--- 1.95/mysql-test/t/select.test	2006-01-13 12:13:49 +03:00
+++ 1.96/mysql-test/t/select.test	2006-01-13 16:05:20 +03:00
@@ -2807,6 +2807,19 @@
 DROP TABLE t1,t2,t3;
 
 #
+# Bug#15347 Wrong result of subselect when records cache and set functions
+#           are involved
+#
+create  table t1 (f1 int);
+insert into t1 values(1),(2);
+create table t2 (f2 int, f3 int, key(f2));
+insert into t2 values(1,1),(2,2);
+create table t3 (f4 int not null);
+insert into t3 values (2),(2),(2);
+select f1,(select count(*) from t2,t3 where f2=f1 and f3=f4) as count from t1;
+drop table t1,t2,t3;
+
+#
 # Bug #15633 Evaluation of Item_equal for non-const table caused wrong
 #            select result
 #