bk commit into 5.2 tree (sergefp:1.2337)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.2 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@stripped, 2006-12-09 05:51:10+03:00, sergefp@stripped +1 -0
  Merge mysql.com:/home/psergey/mysql-5.2-part_key_seg-test
  into  mysql.com:/home/psergey/mysql-5.2-mymrr-r31
  MERGE: 1.2333.1.1

  sql/sql_select.cc@stripped, 2006-12-09 05:51:05+03:00, sergefp@stripped +0 -0
    Auto merged
    MERGE: 1.440.1.1

# 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:	pylon.mylan
# Root:	/home/psergey/mysql-5.2-mymrr-r31/RESYNC

--- 1.442/sql/sql_select.cc	2006-12-09 05:51:16 +03:00
+++ 1.443/sql/sql_select.cc	2006-12-09 05:51:16 +03:00
@@ -5393,7 +5393,8 @@
         }
 
       }
-      if (tmp || !cond)
+      if (tmp || !cond || tab->type == JT_REF || tab->type == JT_REF_OR_NULL ||
+          tab->type == JT_EQ_REF)
       {
 	DBUG_EXECUTE("where",print_where(tmp,tab->table->alias););
 	SQL_SELECT *sel= tab->select= ((SQL_SELECT*)
@@ -5407,7 +5408,7 @@
           The guard will turn the predicate on only after
           the first match for outer tables is encountered.
 	*/        
-        if (cond)
+        if (cond && tmp)
         {
           /*
             Because of QUICK_GROUP_MIN_MAX_SELECT there may be a select without