Kouhei Sutou
null+****@clear*****
Fri Apr 27 17:30:13 JST 2018
Kouhei Sutou 2018-04-27 17:30:13 +0900 (Fri, 27 Apr 2018) New Revision: 66bb82e4d37f680f2cf6307dd62dcb74405878cc https://github.com/mroonga/mroonga/commit/66bb82e4d37f680f2cf6307dd62dcb74405878cc Message: mariadb10.3: follow TABLE_LIST::table_name API change Modified files: ha_mroonga.cpp mrn_mysql_compat.h Modified: ha_mroonga.cpp (+6 -4) =================================================================== --- ha_mroonga.cpp 2018-04-27 17:21:41 +0900 (a304a4f3) +++ ha_mroonga.cpp 2018-04-27 17:30:13 +0900 (44ee8761) @@ -3283,10 +3283,12 @@ int ha_mroonga::create_share_for_create() const mrn_init_alloc_root(&mem_root_for_create, "mroonga::create", 1024, 0, MYF(0)); analyzed_for_create = true; if (table_list) { - share_for_create.table_name = mrn_my_strndup(table_list->table_name, - table_list->table_name_length, - MYF(MY_WME)); - share_for_create.table_name_length = table_list->table_name_length; + share_for_create.table_name = + mrn_my_strndup(MRN_TABLE_LIST_TABLE_NAME_DATA(table_list), + MRN_TABLE_LIST_TABLE_NAME_LENGTH(table_list), + MYF(MY_WME)); + share_for_create.table_name_length = + MRN_TABLE_LIST_TABLE_NAME_LENGTH(table_list); } share_for_create.table_share = &table_share_for_create; table_for_create.s = &table_share_for_create; Modified: mrn_mysql_compat.h (+12 -0) =================================================================== --- mrn_mysql_compat.h 2018-04-27 17:21:41 +0900 (13866175) +++ mrn_mysql_compat.h 2018-04-27 17:30:13 +0900 (5e07d938) @@ -624,3 +624,15 @@ typedef uint mrn_alter_table_flags; Alter_inplace_info::ALTER_ ## name # define MRN_ALTER_INFO_FLAG(name) Alter_info::ALTER_ ## name #endif + +#if defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100306 +# define MRN_TABLE_LIST_TABLE_NAME_DATA(table_list) \ + (table_list)->table_name.str +# define MRN_TABLE_LIST_TABLE_NAME_LENGTH(table_list) \ + (table_list)->table_name.length +#else +# define MRN_TABLE_LIST_TABLE_NAME_DATA(table_list) \ + (table_list)->table_name +# define MRN_TABLE_LIST_TABLE_NAME_LENGTH(table_list) \ + (table_list)->table_name_length +#endif -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180427/6adccb84/attachment-0001.htm
