bk commit into 5.0 tree (mskold:1.1904)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 repository of marty. When marty 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.1904 05/06/02 16:56:08 mskold@stripped +1 -0
  Added update_used_tables to add_found_match_trig_cond, to make valgrind happy

  sql/sql_select.cc
    1.322 05/06/02 16:55:25 mskold@stripped +5 -4
    Added update_used_tables to add_found_match_trig_cond, to make valgrind happy

# 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:	mskold
# Host:	blowfish.ndb.mysql.com
# Root:	/usr/local/home/marty/MySQL/mysql-5.0

--- 1.321/sql/sql_select.cc	Thu Jun  2 14:48:10 2005
+++ 1.322/sql/sql_select.cc	Thu Jun  2 16:55:25 2005
@@ -5233,7 +5233,10 @@
     tmp= new Item_func_trig_cond(tmp, &tab->found);
   }
   if (tmp)
+  {
     tmp->quick_fix_field();
+    tmp->update_used_tables();
+  }
   return tmp;
 }
 
@@ -5454,7 +5457,6 @@
 	*/        
         if (cond)
         {
-          COND *unguarded= tmp;
           /*
             Because of QUICK_GROUP_MIN_MAX_SELECT there may be a select without
             a cond, so neutralize the hack above.
@@ -5465,11 +5467,10 @@
           /* Push condition to storage engine if this is enabled
              and the condition is not guarded */
           tab->table->file->pushed_cond= NULL;
-	  if (thd->variables.engine_condition_pushdown &&
-              unguarded == tmp)
+	  if (thd->variables.engine_condition_pushdown)
           {
             COND *push_cond= 
-              make_cond_for_table(cond, current_map, current_map);
+              make_cond_for_table(tmp, current_map, current_map);
             if (push_cond)
             {
               /* Push condition to handler */