myisammrg::records_in_range

4 files changed, 58 insertions, 1 deletions

diff --git a/myisammrg/Makefile.am b/myisammrg/Makefile.am
index 299b1a20d6e..6a6824affba 100644
--- a/myisammrg/Makefile.am
+++ b/myisammrg/Makefile.am
@@ -21,7 +21,7 @@ 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_rprev.c myrg_queue.c myrg_write.c myrg_range.c
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/myisammrg/myrg_range.c b/myisammrg/myrg_range.c
new file mode 100644
index 00000000000..9d93ad75a35
--- /dev/null
+++ b/myisammrg/myrg_range.c
@@ -0,0 +1,39 @@
+/* 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"
+
+ha_rows myrg_records_in_range(MYRG_INFO *info, int inx, const byte *start_key,
+                              uint start_key_len,
+                              enum ha_rkey_function start_search_flag,
+                              const byte *end_key, uint end_key_len,
+                              enum ha_rkey_function end_search_flag)
+{
+  ha_rows records=0, res;
+  MYRG_TABLE *table;
+
+  for (table=info->open_tables ; table != info->end_table ; table++)
+  {
+    res=mi_records_in_range(table->table, inx,
+                start_key, start_key_len, start_search_flag,
+                  end_key,   end_key_len,   end_search_flag);
+    if (res == HA_POS_ERROR || records > HA_POS_ERROR - res)
+      return res;
+    records+=res;
+  }
+  return records;
+}
+
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index 2342561b7f8..07683dca73e 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -187,6 +187,19 @@ void ha_myisammrg::position(const byte *record)
   ha_store_ptr(ref, ref_length, (my_off_t) position);
 }
 
+ha_rows ha_myisammrg::records_in_range(int inx,
+				    const byte *start_key,uint start_key_len,
+				    enum ha_rkey_function start_search_flag,
+				    const byte *end_key,uint end_key_len,
+				    enum ha_rkey_function end_search_flag)
+{
+  return (ha_rows) myrg_records_in_range(file,
+				       inx,
+				       start_key,start_key_len,
+				       start_search_flag,
+				       end_key,end_key_len,
+				       end_search_flag);
+}
 
 void ha_myisammrg::info(uint flag)
 {
diff --git a/sql/ha_myisammrg.h b/sql/ha_myisammrg.h
index b75d5360097..8e33b99e418 100644
--- a/sql/ha_myisammrg.h
+++ b/sql/ha_myisammrg.h
@@ -69,6 +69,11 @@ class ha_myisammrg: public handler
   int rnd_next(byte *buf);
   int rnd_pos(byte * buf, byte *pos);
   void position(const byte *record);
+  ha_rows ha_myisammrg::records_in_range(int inx,
+				    const byte *start_key,uint start_key_len,
+				    enum ha_rkey_function start_search_flag,
+				    const byte *end_key,uint end_key_len,
+				    enum ha_rkey_function end_search_flag);
   my_off_t row_position() { return myrg_position(file); }
   void info(uint);
   int extra(enum ha_extra_function operation);