Kouhei Sutou
null+****@clear*****
Sun Jul 8 07:24:51 JST 2018
Kouhei Sutou 2018-07-08 07:24:51 +0900 (Sun, 08 Jul 2018) New Revision: b31c3fd40ca73c632f6e719f0b6a994a207ab79a https://github.com/mroonga/mroonga/commit/b31c3fd40ca73c632f6e719f0b6a994a207ab79a Message: mysql8: use SHOW_VAR instead of st_mysql_show_var Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+7 -1) =================================================================== --- ha_mroonga.cpp 2018-07-08 07:09:40 +0900 (231eb818) +++ ha_mroonga.cpp 2018-07-08 07:24:51 +0900 (553e856d) @@ -751,6 +751,12 @@ static grn_logger mrn_logger = { static struct st_mysql_storage_engine storage_engine_structure = { MYSQL_HANDLERTON_INTERFACE_VERSION }; +#if MYSQL_VERSION_ID >= 80011 && !defined(MRN_MARIADB_P) +typedef SHOW_VAR mrn_show_var; +#else +typedef struct st_mysql_show_var mrn_show_var; +#endif + #if MYSQL_VERSION_ID >= 50706 && !defined(MRN_MARIADB_P) # define MRN_STATUS_VARIABLE_ENTRY(name, value, type, scope) \ {name, value, type, scope} @@ -759,7 +765,7 @@ static struct st_mysql_storage_engine storage_engine_structure = {name, value, type} #endif -static struct st_mysql_show_var mrn_status_variables[] = +static mrn_show_var mrn_status_variables[] = { MRN_STATUS_VARIABLE_ENTRY(MRN_STATUS_VARIABLE_NAME_PREFIX_STRING "_count_skip", (char *)&mrn_count_skip, -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180708/68bbe50b/attachment.htm
