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

mroonga · Aug 12, 2011 · 958dc42 · 958dc42
1 parent d5534fa
commit 958dc42
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/ha_mroonga.cc b/ha_mroonga.cc
@@ -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);
     }

diff --git a/ha_mroonga.h b/ha_mroonga.h
@@ -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