Kouhei Sutou
null+****@clear*****
Wed Mar 18 10:05:40 JST 2015
Kouhei Sutou 2015-03-18 10:05:40 +0900 (Wed, 18 Mar 2015) New Revision: 149dc3011dae2aad4bea80a99215d566693d62a4 https://github.com/mroonga/mroonga/commit/149dc3011dae2aad4bea80a99215d566693d62a4 Message: Move macro related to MySQL version to mrn_mysql_compat.h Modified files: mrn_mysql.h mrn_mysql_compat.h Modified: mrn_mysql.h (+0 -6) =================================================================== --- mrn_mysql.h 2015-03-18 10:04:46 +0900 (3bcbe9b) +++ mrn_mysql.h 2015-03-18 10:05:40 +0900 (644825d) @@ -58,12 +58,6 @@ # define MRN_MARIADB_P 1 #endif -#if MYSQL_VERSION_ID >= 50607 -# if !defined(MRN_MARIADB_P) -# define MRN_HAVE_SQL_OPTIMIZER_H -# endif -#endif - #define MRN_MESSAGE_BUFFER_SIZE 1024 #define MRN_DBUG_ENTER_FUNCTION() DBUG_ENTER(__FUNCTION__) Modified: mrn_mysql_compat.h (+6 -0) =================================================================== --- mrn_mysql_compat.h 2015-03-18 10:04:46 +0900 (dfdf4c9) +++ mrn_mysql_compat.h 2015-03-18 10:05:40 +0900 (d5e9eee) @@ -200,6 +200,12 @@ # define mrn_my_stpmov(dst, src) strmov(dst, src) #endif +#if MYSQL_VERSION_ID >= 50607 +# if !defined(MRN_MARIADB_P) +# define MRN_HAVE_SQL_OPTIMIZER_H +# endif +#endif + #if MYSQL_VERSION_ID >= 50600 && !defined(MRN_MARIADB_P) # define MRN_HAVE_BINGLOG_H #endif -------------- next part -------------- HTML����������������������������...Download