null+****@clear*****
null+****@clear*****
2011年 8月 12日 (金) 10:31:27 JST
Kouhei Sutou 2011-08-12 01:31:27 +0000 (Fri, 12 Aug 2011)
New Revision: 39edc3fa45b98fa62f7ef654f2dca71282f4daeb
Log:
[mysql-5.6] handler::index_next() is protected. refs #1046
Modified files:
ha_mroonga.cc
ha_mroonga.h
Modified: ha_mroonga.cc (+4 -0)
===================================================================
--- ha_mroonga.cc 2011-08-12 01:27:25 +0000 (3bca2cf)
+++ ha_mroonga.cc 2011-08-12 01:31:27 +0000 (13ee274)
@@ -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);
Modified: ha_mroonga.h (+7 -1)
===================================================================
--- ha_mroonga.h 2011-08-12 01:27:25 +0000 (84386ca)
+++ ha_mroonga.h 2011-08-12 01:31:27 +0000 (5214389)
@@ -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 @@ public:
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 @@ protected:
#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