bk commit into 6.0 tree (sergefp:1.2611)

[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-04-23 05:46:05+04:00, sergefp@stripped +1 -0
  Fix DS-MRR implementation to process semi-joins correctly
  - Look into the right location when examining the match flag
  - Do not do rnd_pos() call if we already have a match

  sql/handler.cc@stripped, 2008-04-23 05:45:52+04:00, sergefp@stripped +12 -6
    Fix DS-MRR implementation to process semi-joins correctly
    - Look into the right location when examining the match flag
    - Do not do rnd_pos() call if we already have a match

diff -Nrup a/sql/handler.cc b/sql/handler.cc
--- a/sql/handler.cc	2008-04-06 11:20:37 +04:00
+++ b/sql/handler.cc	2008-04-23 05:45:52 +04:00
@@ -4473,10 +4473,11 @@ int DsMrr_impl::dsmrr_next(handler *h, c
 {
   int res;
   uchar *cur_range_info;
+  uchar *rowid;
   
   if (use_default_impl)
     return h->handler::multi_range_read_next(range_info);
-    
+  
   do
   {
     if (rowids_buf_cur == rowids_buf_last)
@@ -4498,14 +4499,19 @@ int DsMrr_impl::dsmrr_next(handler *h, c
       res= HA_ERR_END_OF_FILE;
       goto end;
     }
-    res= h->rnd_pos(table->record[0], rowids_buf_cur);
-    cur_range_info= rowids_buf_cur + h->ref_length;
+    rowid= rowids_buf_cur;
+    cur_range_info= *(uchar**)(rowids_buf_cur + h->ref_length);
     rowids_buf_cur += h->ref_length + sizeof(void*) * test(is_mrr_assoc);
-  } while (semi_join && *cur_range_info==0);
+    if (semi_join && *cur_range_info == 1)
+      continue;
+    res= h->rnd_pos(table->record[0], rowid);
+    break;
+  } while (true);
  
   if (is_mrr_assoc)
-    memcpy(range_info, cur_range_info, sizeof(void*));
-
+  {
+    memcpy(range_info, rowid + h->ref_length, sizeof(void*));
+  }
 end:
   return res;
 }