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

mroonga · Aug 12, 2011 · d5534fa · d5534fa
1 parent 24edb71
commit d5534fa
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
@@ -3913,7 +3913,11 @@ int ha_mroonga::wrapper_index_last(uchar *buf)
   MRN_SET_WRAP_TABLE_KEY(this, table);
   if (fulltext_searching)
     set_pk_bitmap();
+#ifdef MRN_HANDLER_HAVE_HA_INDEX_LAST
+  error = wrap_handler->ha_index_last(buf);
+#else
   error = wrap_handler->index_last(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
@@ -44,6 +44,7 @@ extern "C" {
 #  define MRN_HANDLER_HAVE_HA_INDEX_NEXT 1
 #  define MRN_HANDLER_HAVE_HA_INDEX_PREV 1
 #  define MRN_HANDLER_HAVE_HA_INDEX_FIRST 1
+#  define MRN_HANDLER_HAVE_HA_INDEX_LAST 1
 #endif
 
 #if MYSQL_VERSION_ID < 50600
@@ -195,7 +196,9 @@ class ha_mroonga: public handler
 #ifndef MRN_HANDLER_HAVE_HA_INDEX_FIRST
   int index_first(uchar *buf);
 #endif
-  int index_last(uchar * buf);
+#ifndef MRN_HANDLER_HAVE_HA_INDEX_LAST
+  int index_last(uchar *buf);
+#endif
   int index_next_same(uchar *buf, const uchar *key, uint keylen);
 
   int read_range_first(const key_range *start_key,
@@ -266,6 +269,9 @@ class ha_mroonga: public handler
 #ifdef MRN_HANDLER_HAVE_HA_INDEX_FIRST
   int index_first(uchar *buf);
 #endif
+#ifdef MRN_HANDLER_HAVE_HA_INDEX_LAST
+  int index_last(uchar *buf);
+#endif
 
 private:
 #ifdef MRN_HANDLER_HAVE_HA_CLOSE