myisammrg::index_next_same

myisammrg/Makefile.am:
  myrg_rnext_same.c added

3 files changed, 44 insertions, 3 deletions

diff --git a/myisammrg/Makefile.am b/myisammrg/Makefile.am
index 6a6824affba..b749b84ba0b 100644
--- a/myisammrg/Makefile.am
+++ b/myisammrg/Makefile.am
@@ -21,7 +21,8 @@ libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
 			myrg_rrnd.c myrg_update.c myrg_delete.c myrg_rsame.c \
 			myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \
 			myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \
-			myrg_rprev.c myrg_queue.c myrg_write.c myrg_range.c
+			myrg_rprev.c myrg_queue.c myrg_write.c myrg_range.c \
+			myrg_rnext_same.c
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/myisammrg/myrg_rkey.c b/myisammrg/myrg_rkey.c
index ba042352a51..c0cef5a4eca 100644
--- a/myisammrg/myrg_rkey.c
+++ b/myisammrg/myrg_rkey.c
@@ -62,9 +62,8 @@ int myrg_rkey(MYRG_INFO *info,byte *record,int inx, const byte *key,
     }
     else
     {
-      mi->use_packed_key=1;
+      mi->once_flags|= USE_PACKED_KEYS;
       err=mi_rkey(mi,0,inx,key_buff,pack_key_length,search_flag);
-      mi->use_packed_key=0;
     }
     info->last_used_table=table+1;
 
@@ -83,5 +82,6 @@ int myrg_rkey(MYRG_INFO *info,byte *record,int inx, const byte *key,
     return HA_ERR_KEY_NOT_FOUND;
 
   mi=(info->current_table=(MYRG_TABLE *)queue_top(&(info->by_key)))->table;
+  mi->once_flags|= RRND_PRESERVE_LASTINX;
   return mi_rrnd(mi,record,mi->lastpos);
 }
diff --git a/myisammrg/myrg_rnext_same.c b/myisammrg/myrg_rnext_same.c
new file mode 100644
index 00000000000..b569459b77d
--- /dev/null
+++ b/myisammrg/myrg_rnext_same.c
@@ -0,0 +1,40 @@
+/* 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 */
+
+#include "myrg_def.h"
+
+int myrg_rnext_same(MYRG_INFO *info, byte *buf)
+{
+  uint err;
+  MI_INFO *mi;
+
+  if (!info->current_table)
+    return (HA_ERR_KEY_NOT_FOUND);
+
+  err=mi_rnext_same(info->current_table->table,buf);
+  if (err == HA_ERR_END_OF_FILE)
+  {
+    queue_remove(&(info->by_key),0);
+    if (!info->by_key.elements)
+      return HA_ERR_END_OF_FILE;
+
+    mi=(info->current_table=(MYRG_TABLE *)queue_top(&(info->by_key)))->table;
+    mi->once_flags|= RRND_PRESERVE_LASTINX;
+    return mi_rrnd(mi,buf,mi->lastpos);
+  }
+  return err;
+}
+