bk commit into 5.0 tree (gkodinov:1.2219)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge 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@stripped, 2006-07-26 19:23:44+03:00, gkodinov@stripped +2 -0
  Merge macbook.gmz:/Users/kgeorge/mysql/work/B20792-4.1-opt
  into  macbook.gmz:/Users/kgeorge/mysql/work/B20792-5.0-opt
  MERGE: 1.1616.2673.1

  mysql-test/r/subselect2.result@stripped, 2006-07-26 19:23:34+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.5.1.4

  sql/sql_select.cc@stripped, 2006-07-26 19:23:35+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.216.125.12

# 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:	gkodinov
# Host:	macbook.gmz
# Root:	/Users/kgeorge/mysql/work/B20792-5.0-opt/RESYNC

--- 1.438/sql/sql_select.cc	2006-07-26 19:24:00 +03:00
+++ 1.439/sql/sql_select.cc	2006-07-26 19:24:00 +03:00
@@ -6194,10 +6194,16 @@ return_zero_rows(JOIN *join, select_resu
   DBUG_RETURN(0);
 }
 
-
+/*
+  used only in JOIN::clear
+*/
 static void clear_tables(JOIN *join)
 {
-  for (uint i=0 ; i < join->tables ; i++)
+  /* 
+    must clear only the non-const tables, as const tables
+    are not re-calculated.
+  */
+  for (uint i=join->const_tables ; i < join->tables ; i++)
     mark_as_null_row(join->table[i]);		// All fields are NULL
 }
 

--- 1.12/mysql-test/r/subselect2.result	2006-07-26 19:24:00 +03:00
+++ 1.13/mysql-test/r/subselect2.result	2006-07-26 19:24:00 +03:00
@@ -132,3 +132,15 @@ id	select_type	table	type	possible_keys	
 5	DEPENDENT SUBQUERY	t3	unique_subquery	PRIMARY,FFOLDERID_IDX	PRIMARY	34	func	1	Using index; Using where
 6	DEPENDENT SUBQUERY	t3	unique_subquery	PRIMARY,FFOLDERID_IDX,CMFLDRPARNT_IDX	PRIMARY	34	func	1	Using index; Using where
 drop table t1, t2, t3, t4;
+CREATE TABLE t1 (a int(10) , PRIMARY KEY (a)) Engine=InnoDB;
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (a int(10), PRIMARY KEY (a)) Engine=InnoDB;
+INSERT INTO t2 VALUES (1);
+CREATE TABLE t3 (a int(10), b int(10), c int(10),
+PRIMARY KEY (a)) Engine=InnoDB;
+INSERT INTO t3 VALUES (1,2,1);
+SELECT t1.* FROM t1 WHERE (SELECT COUNT(*) FROM t3,t2 WHERE t3.c=t2.a 
+and t2.a='1' AND t1.a=t3.b) > 0;
+a
+2
+DROP TABLE t1,t2,t3;