bk commit into 5.2 tree (sergefp:1.2478)

[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 02:44:58+03:00, sergefp@stripped +1 -0
  WL#2475: "Batched range read functions for MyISAM/InnoDb"
  Fix RBR crashes: Make RBR code follow the new rnd_pos() calling 
  convention: now one must call rnd_init() before calling rnd_pos().

  sql/log_event.cc@stripped, 2007-03-11 02:44:55+03:00, sergefp@stripped +20 -1
    WL#2475: "Batched range read functions for MyISAM/InnoDb"
    Fix RBR crashes: Make RBR code follow the new rnd_pos() calling 
    convention: now one must call rnd_init() before calling rnd_pos().

# 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.267/sql/log_event.cc	2007-03-11 02:45:08 +03:00
+++ 1.268/sql/log_event.cc	2007-03-11 02:45:08 +03:00
@@ -6704,7 +6704,15 @@
      */
     if (table->file->ha_table_flags() & HA_DUPLICATE_POS)
     {
+      if (table->file->inited && (error= table->file->ha_index_end()))
+        DBUG_RETURN(error);
+      if ((error= table->file->ha_rnd_init(FALSE)))
+        DBUG_RETURN(error);
+      
       error= table->file->rnd_pos(table->record[1], table->file->dup_ref);
+      int err2= table->file->ha_rnd_end();
+      if (!error && err2)
+        error= err2;
       if (error)
         DBUG_RETURN(error);
     }
@@ -6871,7 +6879,18 @@
 
     */
     table->file->position(table->record[0]);
-    int error= table->file->rnd_pos(table->record[0], table->file->ref);
+    int error;
+    if (table->file->inited && (error= table->file->ha_index_end()))
+      DBUG_RETURN(error);
+    if ((error= table->file->ha_rnd_init(FALSE)))
+      DBUG_RETURN(error);
+
+    error= table->file->rnd_pos(table->record[0], table->file->ref);
+
+    int err2= table->file->ha_rnd_end();
+    if (!error && err2)
+       error=err2;
+
     /*
       rnd_pos() returns the record in table->record[0], so we have to
       move it to table->record[1].