bk commit into 5.2 tree (sergefp:1.2476)

[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, 2007-03-10 23:02:56+03:00, sergefp@stripped +1 -0
  WL#2475: "Batched range read functions for MyISAM/InnoDb"
  Fix valgrind errors: Let make_remainder_cond() set the used_tables
  attribute for items it returns.

  sql/sql_select.cc@stripped, 2007-03-10 23:02:51+03:00, sergefp@stripped +9 -0
    WL#2475: "Batched range read functions for MyISAM/InnoDb"
    Fix valgrind errors: Let make_remainder_cond() set the used_tables
    attribute for items it returns.

# 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-r55

--- 1.498/sql/sql_select.cc	2007-03-10 23:03:05 +03:00
+++ 1.499/sql/sql_select.cc	2007-03-10 23:03:05 +03:00
@@ -6243,6 +6243,7 @@
 
   if (cond->type() == Item::COND_ITEM)
   {
+    table_map tbl_map= 0;
     if (((Item_cond*) cond)->functype() == Item_func::COND_AND_FUNC)
     {
       /* Create new top level AND item */
@@ -6255,7 +6256,10 @@
       {
 	Item *fix= make_cond_remainder(item, exclude_index);
 	if (fix)
+        {
 	  new_cond->argument_list()->push_back(fix);
+          tbl_map |= fix->used_tables();
+        }
       }
       switch (new_cond->argument_list()->elements) {
       case 0:
@@ -6264,6 +6268,7 @@
 	return new_cond->argument_list()->head();
       default:
 	new_cond->quick_fix_field();
+        ((Item_cond*)new_cond)->used_tables_cache= tbl_map;
 	return new_cond;
       }
     }
@@ -6280,8 +6285,10 @@
 	if (!fix)
 	  return (COND*) 0;
 	new_cond->argument_list()->push_back(fix);
+        tbl_map |= fix->used_tables();
       }
       new_cond->quick_fix_field();
+      ((Item_cond*)new_cond)->used_tables_cache= tbl_map;
       new_cond->top_level_item();
       return new_cond;
     }
@@ -6331,6 +6338,8 @@
         {
           tab->select_cond= new Item_cond_and(row_cond, idx_remainder_cond);
 	  tab->select_cond->quick_fix_field();
+          ((Item_cond_and*)tab->select_cond)->used_tables_cache= 
+            row_cond->used_tables() | idx_remainder_cond->used_tables();
         }
       }
       else