Kouhei Sutou
null+****@clear*****
Mon Jul 9 15:26:09 JST 2018
Kouhei Sutou 2018-07-09 15:26:09 +0900 (Mon, 09 Jul 2018) New Revision: 4fc3c9334fcbb4ca149b0ff1919982f4c6fe0439 https://github.com/mroonga/mroonga/commit/4fc3c9334fcbb4ca149b0ff1919982f4c6fe0439 Message: mysql8: add compatibility layer for SELECT_LEX It was st_select_lex. Modified files: ha_mroonga.cpp mrn_mysql_compat.h Modified: ha_mroonga.cpp (+4 -4) =================================================================== --- ha_mroonga.cpp 2018-07-09 15:22:45 +0900 (3a141478) +++ ha_mroonga.cpp 2018-07-09 15:26:09 +0900 (02966f94) @@ -10781,7 +10781,7 @@ void ha_mroonga::check_count_skip(key_part_map target_key_part_map) DBUG_VOID_RETURN; } - st_select_lex *select_lex = table->pos_in_table_list->select_lex; + mrn_select_lex *select_lex = table->pos_in_table_list->select_lex; KEY *key_info = NULL; if (active_index != MAX_KEY) { key_info = &(table->key_info[active_index]); @@ -10854,9 +10854,9 @@ void ha_mroonga::check_fast_order_limit(grn_table_sort_key **sort_keys, } TABLE_LIST *table_list = table->pos_in_table_list; - st_select_lex *select_lex = table_list->select_lex; + mrn_select_lex *select_lex = table_list->select_lex; SELECT_LEX_UNIT *unit = MRN_TABLE_LIST_GET_DERIVED(table_list); - st_select_lex *first_select_lex; + mrn_select_lex *first_select_lex; if (unit) { first_select_lex = unit->first_select(); @@ -12912,7 +12912,7 @@ int ha_mroonga::generic_reset() DBUG_RETURN(error); } - st_select_lex *select_lex = table_list->select_lex; + mrn_select_lex *select_lex = table_list->select_lex; if (!select_lex) { DBUG_RETURN(error); } Modified: mrn_mysql_compat.h (+7 -0) =================================================================== --- mrn_mysql_compat.h 2018-07-09 15:22:45 +0900 (5a9c39b2) +++ mrn_mysql_compat.h 2018-07-09 15:26:09 +0900 (bb580d47) @@ -693,3 +693,10 @@ #else typedef Foreign_key mrn_foreign_key_spec; #endif + +#if MYSQL_VERSION_ID >= 80011 && !defined(MRN_MARIADB_P) + class SELECT_LEX; + typedef SELECT_LEX mrn_select_lex; +#else + typedef st_select_lex mrn_select_lex; +#endif -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180709/03fe9061/attachment-0001.htm
