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, 9 insertions, 3 deletions

diff --git a/include/myisammrg.h b/include/myisammrg.h
index cf18e407962..64c2067b70f 100644
--- a/include/myisammrg.h
+++ b/include/myisammrg.h
@@ -1,15 +1,15 @@
 /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
-   
+
    This library 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
    Library General Public License for more details.
-   
+
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -30,6 +30,8 @@ extern "C" {
 #include <myisam.h>
 #endif
 
+#include <queues.h>
+
 #define MYRG_NAME_EXT	".MRG"
 
 	/* Param to/from myrg_info */
@@ -60,6 +62,7 @@ typedef struct st_myrg_info
   uint	 tables,options,reclength;
   my_bool cache_in_use;
   LIST	open_list;
+  QUEUE     by_key;
 } MYRG_INFO;
 
 
@@ -70,6 +73,9 @@ extern int myrg_delete(MYRG_INFO *file,const byte *buff);
 extern MYRG_INFO *myrg_open(const char *name,int mode,int wait_if_locked);
 extern int myrg_panic(enum ha_panic_function function);
 extern int myrg_rfirst(MYRG_INFO *file,byte *buf,int inx);
+extern int myrg_rlast(MYRG_INFO *file,byte *buf,int inx);
+extern int myrg_rnext(MYRG_INFO *file,byte *buf,int inx);
+extern int myrg_rprev(MYRG_INFO *file,byte *buf,int inx);
 extern int myrg_rkey(MYRG_INFO *file,byte *buf,int inx,const byte *key,
 		       uint key_len, enum ha_rkey_function search_flag);
 extern int myrg_rrnd(MYRG_INFO *file,byte *buf,ulonglong pos);