null+****@clear*****
null+****@clear*****
2011年 8月 12日 (金) 10:43:17 JST
Kouhei Sutou 2011-08-12 01:43:17 +0000 (Fri, 12 Aug 2011)
New Revision: 958dc42e4147fa9ce97e100415ba0a71f7e325eb
Log:
[mysql-5.6] handler::index_read_idx_map() is protected. refs #1046
Modified files:
ha_mroonga.cc
ha_mroonga.h
Modified: ha_mroonga.cc (+8 -0)
===================================================================
--- ha_mroonga.cc 2011-08-12 01:41:09 +0000 (ec92977)
+++ ha_mroonga.cc 2011-08-12 01:43:17 +0000 (32a1535)
@@ -4482,11 +4482,19 @@ int ha_mroonga::wrapper_ft_read(uchar *buf)
GRN_TEXT_VALUE(&pkey), table->key_info->key_length);
MRN_SET_WRAP_SHARE_KEY(share, table->s);
MRN_SET_WRAP_TABLE_KEY(this, table);
+#ifdef MRN_HANDLER_HAVE_HA_INDEX_READ_IDX_MAP
+ error = wrap_handler->ha_index_read_idx_map(buf,
+ share->wrap_primary_key,
+ (uchar *)GRN_TEXT_VALUE(&pkey),
+ pk_keypart_map,
+ HA_READ_KEY_EXACT);
+#else
error = wrap_handler->index_read_idx_map(buf,
share->wrap_primary_key,
(uchar *)GRN_TEXT_VALUE(&pkey),
pk_keypart_map,
HA_READ_KEY_EXACT);
+#endif
MRN_SET_BASE_SHARE_KEY(share, table->s);
MRN_SET_BASE_TABLE_KEY(this, table);
}
Modified: ha_mroonga.h (+1 -0)
===================================================================
--- ha_mroonga.h 2011-08-12 01:41:09 +0000 (20f1c7d)
+++ ha_mroonga.h 2011-08-12 01:43:17 +0000 (929d7bf)
@@ -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_READ_IDX_MAP 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