[mysql-5.6] handler::index_next() is protected. refs #1046

mroonga · Aug 12, 2011 · 39edc3f · 39edc3f
1 parent aee1054
commit 39edc3f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/ha_mroonga.cc b/ha_mroonga.cc
@@ -3729,7 +3729,11 @@ int ha_mroonga::wrapper_index_next(uchar *buf)
   MRN_SET_WRAP_TABLE_KEY(this, table);
   if (fulltext_searching)
     set_pk_bitmap();
+#ifdef MRN_HANDLER_HAVE_HA_INDEX_NEXT
+  error = wrap_handler->ha_index_next(buf);
+#else
   error = wrap_handler->index_next(buf);
+#endif
   MRN_SET_BASE_SHARE_KEY(share, table->s);
   MRN_SET_BASE_TABLE_KEY(this, table);
   DBUG_RETURN(error);

diff --git a/ha_mroonga.h b/ha_mroonga.h
@@ -41,6 +41,7 @@ extern "C" {
 #  define MRN_HANDLER_HAVE_HA_CLOSE 1
 #  define MRN_HANDLER_HAVE_HA_RND_NEXT 1
 #  define MRN_HANDLER_HAVE_HA_RND_POS 1
+#  define MRN_HANDLER_HAVE_HA_INDEX_NEXT 1
 #endif
 
 #if MYSQL_VERSION_ID < 50600
@@ -183,7 +184,9 @@ class ha_mroonga: public handler
                      enum ha_rkey_function find_flag);
   int index_read_last_map(uchar *buf, const uchar *key,
                           key_part_map keypart_map);
-  int index_next(uchar * buf);
+#ifndef MRN_HANDLER_HAVE_HA_INDEX_NEXT
+  int index_next(uchar *buf);
+#endif
   int index_prev(uchar * buf);
   int index_first(uchar * buf);
   int index_last(uchar * buf);
@@ -248,6 +251,9 @@ class ha_mroonga: public handler
 #ifdef MRN_HANDLER_HAVE_HA_RND_POS
   int rnd_pos(uchar *buf, uchar *pos);
 #endif
+#ifdef MRN_HANDLER_HAVE_HA_INDEX_NEXT
+  int index_next(uchar *buf);
+#endif
 
 private:
 #ifdef MRN_HANDLER_HAVE_HA_CLOSE