Adding upstream version 1:10.11.6.upstream/1%10.11.6

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 43 insertions, 0 deletions

diff --git a/storage/myisammrg/myrg_range.c b/storage/myisammrg/myrg_range.c
new file mode 100644
index 00000000..da5e2c38
--- /dev/null
+++ b/storage/myisammrg/myrg_range.c
@@ -0,0 +1,43 @@
+/* Copyright (c) 2002, 2004-2006 MySQL AB
+   Use is subject to license terms
+
+   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; version 2 of the License.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA */
+
+#include "myrg_def.h"
+
+ha_rows myrg_records_in_range(MYRG_INFO *info, int inx,
+                              const key_range *min_key,
+                              const key_range *max_key,
+                              page_range *pages)
+{
+  ha_rows records=0, res;
+  MYRG_TABLE *table;
+  page_range ignore_pages;
+
+  /* Don't calculate pages of more than one active partition */
+  if (info->open_tables +1 != info->end_table)
+    pages= &ignore_pages;
+
+  for (table=info->open_tables ; table != info->end_table ; table++)
+  {
+    res= mi_records_in_range(table->table, inx, min_key, max_key, pages);
+    if (res == HA_POS_ERROR)
+      return HA_POS_ERROR; 
+    if (records > HA_POS_ERROR - res)
+      return HA_POS_ERROR-1;
+    records+=res;
+  }
+  return records;
+}
+