null+****@clear*****
null+****@clear*****
2011年 8月 12日 (金) 10:35:23 JST
Kouhei Sutou 2011-08-12 01:35:23 +0000 (Fri, 12 Aug 2011)
New Revision: 24edb7125f0cde15e5c930ecc6993394adf63f0a
Log:
[mysql-5.6] handler::index_first() 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:32:46 +0000 (efb7503)
+++ ha_mroonga.cc 2011-08-12 01:35:23 +0000 (caf7256)
@@ -3833,7 +3833,11 @@ int ha_mroonga::wrapper_index_first(uchar *buf)
MRN_SET_WRAP_TABLE_KEY(this, table);
if (fulltext_searching)
set_pk_bitmap();
+#ifdef MRN_HANDLER_HAVE_HA_INDEX_FIRST
+ error = wrap_handler->ha_index_first(buf);
+#else
error = wrap_handler->index_first(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:32:46 +0000 (bdc13c5)
+++ ha_mroonga.h 2011-08-12 01:35:23 +0000 (131009d)
@@ -43,6 +43,7 @@ extern "C" {
# define MRN_HANDLER_HAVE_HA_RND_POS 1
# define MRN_HANDLER_HAVE_HA_INDEX_NEXT 1
# define MRN_HANDLER_HAVE_HA_INDEX_PREV 1
+# define MRN_HANDLER_HAVE_HA_INDEX_FIRST 1
#endif
#if MYSQL_VERSION_ID < 50600
@@ -191,7 +192,9 @@ public:
#ifndef MRN_HANDLER_HAVE_HA_INDEX_PREV
int index_prev(uchar *buf);
#endif
- int index_first(uchar * buf);
+#ifndef MRN_HANDLER_HAVE_HA_INDEX_FIRST
+ int index_first(uchar *buf);
+#endif
int index_last(uchar * buf);
int index_next_same(uchar *buf, const uchar *key, uint keylen);
@@ -260,6 +263,9 @@ protected:
#ifdef MRN_HANDLER_HAVE_HA_INDEX_PREV
int index_prev(uchar *buf);
#endif
+#ifdef MRN_HANDLER_HAVE_HA_INDEX_FIRST
+ int index_first(uchar *buf);
+#endif
private:
#ifdef MRN_HANDLER_HAVE_HA_CLOSE