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 ')

1 files changed, 18 insertions, 0 deletions

diff --git a/mysys/queues.c b/mysys/queues.c
index f33856b892d..40aa3c8db53 100644
--- a/mysys/queues.c
+++ b/mysys/queues.c
@@ -21,6 +21,7 @@
 */
 
 #include "mysys_priv.h"
+#include "mysys_err.h"
 #include <queues.h>
 
 
@@ -43,6 +44,23 @@ int init_queue(QUEUE *queue, uint max_elements, uint offset_to_key,
   DBUG_RETURN(0);
 }
 
+int reinit_queue(QUEUE *queue, uint max_elements, uint offset_to_key,
+               pbool max_at_top, int (*compare) (void *, byte *, byte *),
+               void *first_cmp_arg)
+{
+  DBUG_ENTER("reinit_queue");
+  if (queue->max_elements < max_elements)
+    /* It's real easy to do realloc here, just don't want to bother */
+    DBUG_RETURN(my_errno=EE_OUTOFMEMORY);
+
+  queue->elements=0;
+  queue->compare=compare;
+  queue->first_cmp_arg=first_cmp_arg;
+  queue->offset_to_key=offset_to_key;
+  queue->max_at_top= max_at_top ? (-1 ^ 1) : 0;
+  DBUG_RETURN(0);
+}
+
 void delete_queue(QUEUE *queue)
 {
   DBUG_ENTER("delete_queue");