Kouhei Sutou
null+****@clear*****
Mon Jul 9 07:04:30 JST 2018
Kouhei Sutou 2018-07-09 07:04:30 +0900 (Mon, 09 Jul 2018) New Revision: 51edac6c666273c61161ff35f76b08fbeaaec58f https://github.com/mroonga/mroonga/commit/51edac6c666273c61161ff35f76b08fbeaaec58f Message: Add a missing version check Modified files: ha_mroonga.cpp mrn_mysql_compat.h Modified: ha_mroonga.cpp (+5 -1) =================================================================== --- ha_mroonga.cpp 2018-07-09 06:57:58 +0900 (0c9c1dfb) +++ ha_mroonga.cpp 2018-07-09 07:04:30 +0900 (f1ad292b) @@ -46,7 +46,11 @@ #include <spatial.h> #include <mysql.h> #include <mysql/plugin.h> -#include <mysql/psi/mysql_memory.h> + +#ifdef MRN_HAVE_MYSQL_PSI_MYSQL_MEMORY_H +# include <mysql/psi/mysql_memory.h> +#endif + #include <sys/types.h> #include <sys/stat.h> Modified: mrn_mysql_compat.h (+4 -0) =================================================================== --- mrn_mysql_compat.h 2018-07-09 06:57:58 +0900 (bac5b9f2) +++ mrn_mysql_compat.h 2018-07-09 07:04:30 +0900 (ec0d3fa7) @@ -318,6 +318,10 @@ # define MRN_HAVE_BINLOG_H #endif +#if MYSQL_VERSION_ID >= 50720 && !defined(MRN_MARIADB_P) +# define MRN_HAVE_MYSQL_PSI_MYSQL_MEMORY_H +#endif + #if MYSQL_VERSION_ID >= 50706 && !defined(MRN_MARIADB_P) # define MRN_HAVE_SPATIAL #elif defined(HAVE_SPATIAL) -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180709/80c9d474/attachment.htm
