Kouhei Sutou
null+****@clear*****
Wed Mar 18 10:04:46 JST 2015
Kouhei Sutou 2015-03-18 10:04:46 +0900 (Wed, 18 Mar 2015) New Revision: 7efb8fcd854d10206b4e3c324b5699d2173a2199 https://github.com/mroonga/mroonga/commit/7efb8fcd854d10206b4e3c324b5699d2173a2199 Message: Add binlog.h existent check Modified files: ha_mroonga.cpp mrn_mysql_compat.h Modified: ha_mroonga.cpp (+4 -1) =================================================================== --- ha_mroonga.cpp 2015-03-18 00:24:33 +0900 (8b3107e) +++ ha_mroonga.cpp 2015-03-18 10:04:46 +0900 (23204b8) @@ -36,7 +36,10 @@ #include <sql_select.h> #include <item_sum.h> -#include <binlog.h> + +#ifdef MRN_HAVE_BINLOG_H +# include <binlog.h> +#endif #ifdef MRN_HAVE_SQL_OPTIMIZER_H # include <sql_optimizer.h> Modified: mrn_mysql_compat.h (+4 -0) =================================================================== --- mrn_mysql_compat.h 2015-03-18 00:24:33 +0900 (617298e) +++ mrn_mysql_compat.h 2015-03-18 10:04:46 +0900 (dfdf4c9) @@ -200,4 +200,8 @@ # define mrn_my_stpmov(dst, src) strmov(dst, src) #endif +#if MYSQL_VERSION_ID >= 50600 && !defined(MRN_MARIADB_P) +# define MRN_HAVE_BINGLOG_H +#endif + #endif /* MRN_MYSQL_COMPAT_H_ */ -------------- next part -------------- HTML����������������������������...下载
