Kouhei Sutou
null+****@clear*****
Tue Mar 17 21:56:27 JST 2015
Kouhei Sutou 2015-03-17 21:56:27 +0900 (Tue, 17 Mar 2015) New Revision: 78c189006d3bb1d195ca1d00b068b402c5897521 https://github.com/mroonga/mroonga/commit/78c189006d3bb1d195ca1d00b068b402c5897521 Message: mysql57: follow plugin_data API change Modified files: mrn_table.cpp Modified: mrn_table.cpp (+7 -1) =================================================================== --- mrn_table.cpp 2015-03-17 21:53:38 +0900 (c8d428a) +++ mrn_table.cpp 2015-03-17 21:56:27 +0900 (d74bc07) @@ -40,6 +40,12 @@ # define MRN_HA_RESOLVE_BY_NAME(name) ha_resolve_by_name(NULL, (name)) #endif +#if MYSQL_VERSION_ID >= 50706 && !defined(MRN_MARIADB_P) +# define MRN_PLUGIN_DATA(plugin, type) plugin_data<type>(plugin) +#else +# define MRN_PLUGIN_DATA(plugin, type) plugin_data(plugin, type) +#endif + #define LEX_STRING_IS_EMPTY(string) \ ((string).length == 0 || !(string).str || (string).str[0] == '\0') @@ -474,7 +480,7 @@ int mrn_parse_table_param(MRN_SHARE *share, TABLE *table) error = ER_UNKNOWN_STORAGE_ENGINE; goto error; } - share->hton = plugin_data(share->plugin, handlerton *); + share->hton = MRN_PLUGIN_DATA(share->plugin, handlerton *); share->wrapper_mode = TRUE; } } -------------- next part -------------- HTML����������������������������...Download