Kouhei Sutou
null+****@clear*****
Mon Jul 9 16:01:14 JST 2018
Kouhei Sutou 2018-07-09 16:01:14 +0900 (Mon, 09 Jul 2018) New Revision: 6a9f7cffbcd3e670fd510ada4c211db1f2b284db https://github.com/mroonga/mroonga/commit/6a9f7cffbcd3e670fd510ada4c211db1f2b284db Message: mysql8: add ha_multi_range_read_next() check Modified files: ha_mroonga.cpp ha_mroonga.hpp Modified: ha_mroonga.cpp (+4 -0) =================================================================== --- ha_mroonga.cpp 2018-07-09 15:48:49 +0900 (a7466080) +++ ha_mroonga.cpp 2018-07-09 16:01:14 +0900 (7f92bbf1) @@ -13316,7 +13316,11 @@ int ha_mroonga::wrapper_multi_range_read_next(range_id_t *range_info) MRN_SET_WRAP_TABLE_KEY(this, table); if (fulltext_searching) set_pk_bitmap(); +#ifdef MRN_HANDLER_HAVE_HA_MULTI_RANGE_READ_NEXT error = wrap_handler->ha_multi_range_read_next(range_info); +#else + error = wrap_handler->multi_range_read_next(range_info); +#endif MRN_SET_BASE_SHARE_KEY(share, table->s); MRN_SET_BASE_TABLE_KEY(this, table); DBUG_RETURN(error); Modified: ha_mroonga.hpp (+4 -0) =================================================================== --- ha_mroonga.hpp 2018-07-09 15:48:49 +0900 (7fe8ce4f) +++ ha_mroonga.hpp 2018-07-09 16:01:14 +0900 (1b1bc10b) @@ -358,6 +358,10 @@ typedef uint mrn_alter_table_flags; # define MRN_HANDLER_COMMIT_INPLACE_ALTER_TABLE_HAVE_TABLE_DEFINITION #endif +#if MYSQL_VERSION_ID >= 80011 && !defined(MRN_MARIADB_P) +# define MRN_HANDLER_HAVE_HA_MULTI_RANGE_READ_NEXT +#endif + #if defined(HAVE_PSI_INTERFACE) && \ (MYSQL_VERSION_ID < 80002 || defined(MRN_MARIADB_P)) # define MRN_HAVE_PSI_SERVER -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180709/f1a39ea3/attachment-0001.htm
