Kouhei Sutou
null+****@clear*****
Wed Jun 17 22:54:55 JST 2015
Kouhei Sutou 2015-06-17 22:54:55 +0900 (Wed, 17 Jun 2015) New Revision: 2004560a276f0f5a23ca5914ccba95e7ec496226 https://github.com/mroonga/mroonga/commit/2004560a276f0f5a23ca5914ccba95e7ec496226 Message: mariadb10: use thd->abort_on_warning Because thd_kill_level(thd) doesn't reflect strict mode (STRICT_TRANS_TABLES). I don't know why b3db89c2b99f802fbc6e7798d1e0f14f58d36ee9 was applied. Modified files: mrn_mysql_compat.h Modified: mrn_mysql_compat.h (+1 -5) =================================================================== --- mrn_mysql_compat.h 2015-06-17 22:45:01 +0900 (822deed) +++ mrn_mysql_compat.h 2015-06-17 22:54:55 +0900 (9e5cc6e) @@ -241,11 +241,7 @@ #endif #ifdef MRN_MARIADB_P -# 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 +# define MRN_ABORT_ON_WARNING(thd) thd->abort_on_warning #else # if MYSQL_VERSION_ID >= 50706 # define MRN_ABORT_ON_WARNING(thd) false -------------- next part -------------- HTML����������������������������...Download