bk commit into 5.2 tree (sergefp:1.2477)

[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-11 00:41:50+03:00, sergefp@stripped +1 -0
  WL#2475: "Batched range read functions for MyISAM/InnoDb"
  - Fix valgrind error: GEOM ranges do not have max endpoint and we 
    should pass NULL for max endpoint into records_in_range

  sql/handler.cc@stripped, 2007-03-11 00:41:46+03:00, sergefp@stripped +13 -2
    WL#2475: "Batched range read functions for MyISAM/InnoDb"
    - Fix valgrind error: GEOM ranges do not have max endpoint and we 
      should pass NULL for max endpoint into records_in_range

# 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.299/sql/handler.cc	2007-03-11 00:41:56 +03:00
+++ 1.300/sql/handler.cc	2007-03-11 00:41:56 +03:00
@@ -3126,8 +3126,19 @@
   while (!seq->next(seq_it, &range))
   {
     n_ranges++;
-    key_range *min_endp= range.start_key.length? &range.start_key : NULL;
-    key_range *max_endp= range.end_key.length? &range.end_key : NULL;
+    key_range *min_endp, *max_endp;
+    if (range.range_flag & GEOM_FLAG)
+    {
+      /* In this case tmp_min_flag contains the handler-read-function */
+      range.start_key.flag= (ha_rkey_function) (range.range_flag ^ GEOM_FLAG);
+      min_endp= &range.start_key;
+      max_endp= NULL;
+    }
+    else
+    {
+      min_endp= range.start_key.length? &range.start_key : NULL;
+      max_endp= range.end_key.length? &range.end_key : NULL;
+    }
     if ((range.range_flag & UNIQUE_RANGE) && !(range.range_flag & NULL_RANGE))
       rows= 1; /* there can be at most one row */
     else