[mariadb] disable index_read_last_map(). refs #1152

mroonga · Oct 31, 2011 · dcf21e1 · dcf21e1
1 parent 19b2481
commit dcf21e1
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
@@ -4576,6 +4576,7 @@ int ha_mroonga::index_read_map(uchar *buf, const uchar *key,
   DBUG_RETURN(error);
 }
 
+#ifdef MRN_HANDLER_HAVE_INDEX_READ_LAST_MAP
 int ha_mroonga::wrapper_index_read_last_map(uchar *buf, const uchar *key,
                                             key_part_map keypart_map)
 {
@@ -4662,6 +4663,7 @@ int ha_mroonga::index_read_last_map(uchar *buf, const uchar *key,
   }
   DBUG_RETURN(error);
 }
+#endif
 
 int ha_mroonga::wrapper_index_next(uchar *buf)
 {

diff --git a/ha_mroonga.h b/ha_mroonga.h
@@ -67,6 +67,10 @@ extern "C" {
 #  define MRN_HANDLER_HAVE_HA_INPLACE_INDEX_CHANGE
 #endif
 
+#ifndef MRN_MARIADB_P
+#  define MRN_HANDLER_HAVE_INDEX_READ_LAST_MAP
+#endif
+
 #if MYSQL_VERSION_ID < 50600
   typedef Item COND;
 #endif
@@ -75,7 +79,7 @@ extern "C" {
   typedef MYSQL_ERROR Sql_condition;
 #endif
 
-#if !defined(MRN_MARIADB_P)
+#ifndef MRN_MARIADB_P
   typedef char *range_id_t;
 #endif
 
@@ -223,8 +227,10 @@ class ha_mroonga: public handler
                      key_part_map keypart_map,
                      enum ha_rkey_function find_flag);
 #endif
+#ifdef MRN_HANDLER_HAVE_INDEX_READ_LAST_MAP
   int index_read_last_map(uchar *buf, const uchar *key,
                           key_part_map keypart_map);
+#endif
 #ifndef MRN_HANDLER_HAVE_HA_INDEX_NEXT
   int index_next(uchar *buf);
 #endif
@@ -481,10 +487,12 @@ class ha_mroonga: public handler
   int storage_index_read_map(uchar *buf, const uchar *key,
                              key_part_map keypart_map,
                              enum ha_rkey_function find_flag);
+#ifdef MRN_HANDLER_HAVE_INDEX_READ_LAST_MAP
   int wrapper_index_read_last_map(uchar *buf, const uchar *key,
                                   key_part_map keypart_map);
   int storage_index_read_last_map(uchar *buf, const uchar *key,
                                   key_part_map keypart_map);
+#endif
   int wrapper_index_next(uchar *buf);
   int storage_index_next(uchar *buf);
   int wrapper_index_prev(uchar *buf);