Kouhei Sutou
null+****@clear*****
Wed Mar 25 13:59:45 JST 2015
Kouhei Sutou 2015-03-25 13:59:45 +0900 (Wed, 25 Mar 2015) New Revision: 4d7a6aea5b151a25670a83289c5483879b9c9ae2 https://github.com/mroonga/mroonga/commit/4d7a6aea5b151a25670a83289c5483879b9c9ae2 Message: mariadb55: don't use thd_kill_statement_service in Mroonga thd_kill_level() uses thd_kill_statement_service internally. It causes failure of Mroonga install after installing and uninstalling Mroonga. Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+5 -1) =================================================================== --- ha_mroonga.cpp 2015-03-25 12:49:54 +0900 (c201990) +++ ha_mroonga.cpp 2015-03-25 13:59:45 +0900 (383de80) @@ -155,7 +155,11 @@ static mysql_mutex_t *mrn_LOCK_open; # define mrn_declare_plugin(NAME) maria_declare_plugin(NAME) # define mrn_declare_plugin_end maria_declare_plugin_end # define MRN_PLUGIN_LAST_VALUES MRN_VERSION, MariaDB_PLUGIN_MATURITY_STABLE -# define MRN_ABORT_ON_WARNING(thd) thd_kill_level(thd) +# if MYSQL_VERSION_ID >= 100000 +# define MRN_ABORT_ON_WARNING(thd) thd_kill_level(thd) +# else +# define MRN_ABORT_ON_WARNING(thd) thd->abort_on_warning +# endif #else # define mrn_declare_plugin(NAME) mysql_declare_plugin(NAME) # define mrn_declare_plugin_end mysql_declare_plugin_end -------------- next part -------------- HTML����������������������������...下載
