Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:27:31 JST 2012
Kouhei Sutou 2011-08-12 11:16:46 +0900 (Fri, 12 Aug 2011) New Revision: a1759223ccd2263e394878a17a97c8818ea312f0 https://github.com/mroonga/mroonga/commit/a1759223ccd2263e394878a17a97c8818ea312f0 Log: [mysql-5.6] use handler::ha_index_next_same(). refs #1046 Modified files: ha_mroonga.cc ha_mroonga.h Modified: ha_mroonga.cc (+4 -0) =================================================================== --- ha_mroonga.cc 2011-08-12 11:15:22 +0900 (c5ea205) +++ ha_mroonga.cc 2011-08-12 11:16:46 +0900 (c6193ed) @@ -3996,7 +3996,11 @@ int ha_mroonga::wrapper_index_next_same(uchar *buf, const uchar *key, MRN_SET_WRAP_TABLE_KEY(this, table); if (fulltext_searching) set_pk_bitmap(); +#ifdef MRN_HANDLER_HAVE_HA_INDEX_NEXT_SAME + error = wrap_handler->ha_index_next_same(buf, key, keylen); +#else error = wrap_handler->index_next_same(buf, key, keylen); +#endif MRN_SET_BASE_SHARE_KEY(share, table->s); MRN_SET_BASE_TABLE_KEY(this, table); DBUG_RETURN(error); Modified: ha_mroonga.h (+1 -0) =================================================================== --- ha_mroonga.h 2011-08-12 11:15:22 +0900 (2e37af2) +++ ha_mroonga.h 2011-08-12 11:16:46 +0900 (632eda3) @@ -46,6 +46,7 @@ extern "C" { # define MRN_HANDLER_HAVE_HA_INDEX_PREV 1 # define MRN_HANDLER_HAVE_HA_INDEX_FIRST 1 # define MRN_HANDLER_HAVE_HA_INDEX_LAST 1 +# define MRN_HANDLER_HAVE_HA_INDEX_NEXT_SAME 1 # define MRN_HANDLER_HAVE_MULTI_RANGE_READ 1 #endif -------------- next part -------------- HTML����������������������������...Download