PART I: Keys support for MyMERGE tables

myisammrg/             |
Makefile.am            |
mymrgdef.h             |   support for keys
myrg_open.c            |          &
myrg_queue.c           |   bugfixes
myrg_rfirst.c          |
myrg_rkey.c            |
myrg_rlast.c           |
myrg_rnext.c           |
myrg_rprev.c           |
myrg_rrnd.c            |

include/myisammrg.h    | rkey/rnext/etc prototyped

sql/                   |
ha_myisammrg.cc        | support for keys
ha_myisammrg.h         |

myisam/                |
mi_rkey.c              | buf==NULL extension, _mi_rkey()
mi_rnext.c             |
mi_rprev.c             |

include/queues.h       | reinit_queue() - same as init_queue, but w/o malloc
mysys/queues.c         |

PART II: Miscellaneous

myisam/common_words    | deleted (looks like I checked it in by mistake)

some files (like acconfig.h, Makefile.am, COPYING.LIB, etc)
                       | Change mode to -rw-r--r-- (by `chmod a-x ')



include/queues.h:
  Initial, from cvs
myisammrg/Makefile.am:
  Initial, from cvs
myisammrg/mymrgdef.h:
  Initial, from cvs
myisammrg/myrg_open.c:
  Initial, from cvs
mysys/queues.c:
  Initial, from cvs
BitKeeper/deleted/.del-common_words:
  ***MISSING WEAVE***
Makefile.am:
  Change mode to -rw-r--r--
include/mysql_version.h.in:
  Change mode to -rw-r--r--
libmysql/acconfig.h:
  ***MISSING WEAVE***
mysys/COPYING.LIB:
  Change mode to -rw-r--r--
sql/item_uniq.cc:
  Change mode to -rw-r--r--
sql/item_uniq.h:
  Change mode to -rw-r--r--
sql/share/Makefile.am:
  Change mode to -rw-r--r--
strings/ChangeLog:
  Change mode to -rw-r--r--
support-files/Makefile.am:
  Change mode to -rw-r--r--
myisam/mi_rkey.c:
  looks like rkey/rnext for MyMERGE is working
myisam/mi_rnext.c:
  looks like rkey/rnext for MyMERGE is working
myisammrg/myrg_queue.c:
  looks like rkey/rnext for MyMERGE is working
myisammrg/myrg_rkey.c:
  looks like rkey/rnext for MyMERGE is working
myisammrg/myrg_rnext.c:
  probably, works
myisammrg/myrg_rprev.c:
  probably, works
include/myisammrg.h:
  rkey/rnext/etc prototyped
myisam/mi_rprev.c:
  buf==NULL, extension
sql/ha_myisammrg.cc:
  support for keys
sql/ha_myisammrg.h:
  support for keys
myisammrg/myrg_rrnd.c:
  ORDER BY didn't work
acconfig.h:
  Change mode to -rw-r--r--

1 files changed, 7 insertions, 3 deletions

diff --git a/myisam/mi_rprev.c b/myisam/mi_rprev.c
index f8f89235549..6a75cc0daa6 100644
--- a/myisam/mi_rprev.c
+++ b/myisam/mi_rprev.c
@@ -1,15 +1,15 @@
 /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
@@ -73,6 +73,10 @@ int mi_rprev(MI_INFO *info, byte *buf, int inx)
     if (my_errno == HA_ERR_KEY_NOT_FOUND)
       my_errno=HA_ERR_END_OF_FILE;
   }
+  else if (!buf)
+  {
+    DBUG_RETURN(info->lastpos==HA_OFFSET_ERROR ? my_errno : 0);
+  }
   else if (!(*info->read_record)(info,info->lastpos,buf))
   {
     info->update|= HA_STATE_AKTIV;		/* Record is read */