bk commit into 6.0 tree (sergefp:1.2798) WL#2771

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
6.0 repository of sergefp.  When sergefp 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, 2008-02-02 18:00:40+03:00, sergefp@stripped +2 -0
  Manual merge of WL#2771 and 6.0 - post-merge fixes

  sql/handler.cc@stripped, 2008-02-02 18:00:35+03:00, sergefp@stripped +1 -1
    Manual merge of WL#2771 and 6.0 - post-merge fixes

  sql/sql_select.cc@stripped, 2008-02-02 18:00:36+03:00, sergefp@stripped +4 -3
    Manual merge of WL#2771 and 6.0 - post-merge fixes

diff -Nrup a/sql/handler.cc b/sql/handler.cc
--- a/sql/handler.cc	2008-02-02 06:03:10 +03:00
+++ b/sql/handler.cc	2008-02-02 18:00:35 +03:00
@@ -3533,7 +3533,7 @@ int DsMrr_impl::dsmrr_init(handler *h, K
   DBUG_ASSERT(!semi_join || is_mrr_assoc);
 
   if (is_mrr_assoc)
-    h->ha_statistic_increment(&SSV::ha_multi_range_read_init_count);
+    status_var_increment(table->in_use->status_var.ha_multi_range_read_init_count);
  
 
   rowids_buf_end= buf->buffer_end;
diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc	2008-02-02 05:40:37 +03:00
+++ b/sql/sql_select.cc	2008-02-02 18:00:36 +03:00
@@ -224,7 +224,7 @@ void select_describe(JOIN *join, bool ne
 			    bool distinct, const char *message=NullS);
 static Item *remove_additional_cond(Item* conds);
 static void add_group_and_distinct_keys(JOIN *join, JOIN_TAB *join_tab);
-static bool test_if_ref(Item_field *left_item,Item *right_item);
+static bool test_if_ref(COND *root_cond, Item_field *left_item,Item *right_item);
 
 /*
   This is used to mark equalities that were made from i-th IN-equality.
@@ -832,8 +832,9 @@ void JOIN::remove_subq_pushed_predicates
       ((Item_func *)this->conds)->functype() == Item_func::EQ_FUNC &&
       ((Item_func *)conds)->arguments()[0]->type() == Item::REF_ITEM &&
       ((Item_func *)conds)->arguments()[1]->type() == Item::FIELD_ITEM &&
-      test_if_ref ((Item_field *)((Item_func *)conds)->arguments()[1],
-                   ((Item_func *)conds)->arguments()[0]))
+      test_if_ref(conds,
+                  (Item_field *)((Item_func *)conds)->arguments()[1],
+                  ((Item_func *)conds)->arguments()[0]))
   {
     *where= 0;
     return;