Kouhei Sutou
null+****@clear*****
Mon Jul 30 09:51:33 JST 2018
Kouhei Sutou 2018-07-30 09:51:33 +0900 (Mon, 30 Jul 2018) New Revision: ce8ce6ef0f0874c1e1ddbe754cffba0520b4769d https://github.com/mroonga/mroonga/commit/ce8ce6ef0f0874c1e1ddbe754cffba0520b4769d Message: mysql57: really support MySQL 5.7.23 Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+23 -3) =================================================================== --- ha_mroonga.cpp 2018-07-30 09:48:09 +0900 (db0b9bd6) +++ ha_mroonga.cpp 2018-07-30 09:51:33 +0900 (576c5eed) @@ -3158,29 +3158,49 @@ uint ha_mroonga::max_supported_key_length() const DBUG_RETURN(res); } -uint ha_mroonga::wrapper_max_supported_key_part_length() const +uint ha_mroonga::wrapper_max_supported_key_part_length( +#ifdef MRN_HANDLER_MAX_SUPPORTED_KEY_PART_LENGTH_HAVE_CREATE_INFO + HA_CREATE_INFO *create_info +#endif + ) const { uint res; MRN_DBUG_ENTER_METHOD(); if (analyzed_for_create && share_for_create.wrapper_mode) { +#ifdef MRN_HANDLER_MAX_SUPPORTED_KEY_PART_LENGTH_HAVE_CREATE_INFO + res = wrap_handler_for_create->max_supported_key_part_length(create_info); +#else res = wrap_handler_for_create->max_supported_key_part_length(); +#endif } else { MRN_SET_WRAP_SHARE_KEY(share, table->s); MRN_SET_WRAP_TABLE_KEY(this, table); +#ifdef MRN_HANDLER_MAX_SUPPORTED_KEY_PART_LENGTH_HAVE_CREATE_INFO + res = wrap_handler->max_supported_key_part_length(create_info); +#else res = wrap_handler->max_supported_key_part_length(); +#endif MRN_SET_BASE_SHARE_KEY(share, table->s); MRN_SET_BASE_TABLE_KEY(this, table); } DBUG_RETURN(res); } -uint ha_mroonga::storage_max_supported_key_part_length() const +uint ha_mroonga::storage_max_supported_key_part_length( +#ifdef MRN_HANDLER_MAX_SUPPORTED_KEY_PART_LENGTH_HAVE_CREATE_INFO + HA_CREATE_INFO *create_info +#endif + ) const { MRN_DBUG_ENTER_METHOD(); DBUG_RETURN(GRN_TABLE_MAX_KEY_SIZE); } -uint ha_mroonga::max_supported_key_part_length() const +uint ha_mroonga::max_supported_key_part_length( +#ifdef MRN_HANDLER_MAX_SUPPORTED_KEY_PART_LENGTH_HAVE_CREATE_INFO + HA_CREATE_INFO *create_info +#endif + ) const { MRN_DBUG_ENTER_METHOD(); -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180730/c69c078f/attachment-0001.htm
