Kouhei Sutou
null+****@clear*****
Mon Jul 9 06:57:58 JST 2018
Kouhei Sutou 2018-07-09 06:57:58 +0900 (Mon, 09 Jul 2018) New Revision: 318533446370b86667d590019416270ea7d0c70e https://github.com/mroonga/mroonga/commit/318533446370b86667d590019416270ea7d0c70e Message: mysql8: add compatibility layer for LEX::create_info It has been changed to HA_CREATE_INFO * from HA_CREATE_INFO. Modified files: ha_mroonga.cpp mrn_mysql_compat.h Modified: ha_mroonga.cpp (+1 -1) =================================================================== --- ha_mroonga.cpp 2018-07-09 06:43:00 +0900 (7c8c3007) +++ ha_mroonga.cpp 2018-07-09 06:57:58 +0900 (0c9c1dfb) @@ -3315,7 +3315,7 @@ int ha_mroonga::create_share_for_create() const int error; THD *thd = ha_thd(); LEX *lex = thd->lex; - HA_CREATE_INFO *create_info = &lex->create_info; + HA_CREATE_INFO *create_info = MRN_LEX_GET_CREATE_INFO(lex); TABLE_LIST *table_list = MRN_LEX_GET_TABLE_LIST(lex); MRN_DBUG_ENTER_METHOD(); wrap_handler_for_create = NULL; Modified: mrn_mysql_compat.h (+6 -0) =================================================================== --- mrn_mysql_compat.h 2018-07-09 06:43:00 +0900 (51311432) +++ mrn_mysql_compat.h 2018-07-09 06:57:58 +0900 (bac5b9f2) @@ -354,6 +354,12 @@ ((select_lex)->options) #endif +#if MYSQL_VERSION_ID >= 80011 && !defined(MRN_MARIADB_P) +# define MRN_LEX_GET_CREATE_INFO(lex) ((lex)->create_info) +#else +# define MRN_LEX_GET_CREATE_INFO(lex) &((lex)->create_info) +#endif + #if defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100000 # if MYSQL_VERSION_ID >= 100306 # define mrn_init_sql_alloc(thd, name, mem_root) \ -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180709/7d4e3e7c/attachment-0001.htm
