Kentaro Hayashi 2019-05-28 13:09:03 +0900 (Tue, 28 May 2019) Revision: 6623391f361456cdc527724dce55b523554f9313 https://github.com/mroonga/mroonga/commit/6623391f361456cdc527724dce55b523554f9313 Message: mariadb55: fix build error On MariaDB 5.5.x, my_byteorder.h is missing. Modified files: ha_mroonga.cpp lib/mrn_value_decoder.cpp mrn_mysql_compat.h Modified: ha_mroonga.cpp (+3 -1) =================================================================== --- ha_mroonga.cpp 2019-05-28 11:29:07 +0900 (9708c545) +++ ha_mroonga.cpp 2019-05-28 13:09:03 +0900 (7ade6148) @@ -47,7 +47,9 @@ #include <mysql.h> #include <mysql/plugin.h> -#include <my_byteorder.h> +#ifdef MRN_HAVE_MY_BYTEORDER_H +# include <my_byteorder.h> +#endif #include <myisampack.h> #ifdef MRN_HAVE_MYSQL_PSI_MYSQL_MEMORY_H Modified: lib/mrn_value_decoder.cpp (+3 -1) =================================================================== --- lib/mrn_value_decoder.cpp 2019-05-28 11:29:07 +0900 (65c160f2) +++ lib/mrn_value_decoder.cpp 2019-05-28 13:09:03 +0900 (73d5bf6a) @@ -19,7 +19,9 @@ #include "mrn_value_decoder.hpp" -#include <my_byteorder.h> +#ifdef MRN_HAVE_MY_BYTEORDER +# include <my_byteorder.h> +#endif #if MYSQL_VERSION_ID >= 50706 && !defined(MRN_MARIADB_P) # define MRN_DEST_IS_POINTER Modified: mrn_mysql_compat.h (+4 -0) =================================================================== --- mrn_mysql_compat.h 2019-05-28 11:29:07 +0900 (d6f1b8c4) +++ mrn_mysql_compat.h 2019-05-28 13:09:03 +0900 (27b62eea) @@ -372,6 +372,10 @@ typedef HASH mrn_table_def_cache_type; # define MRN_HAVE_SQL_DERROR_H #endif +#if defined(MRN_MYSQL_P) || defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100000 +# define MRN_HAVE_MY_BYTEORDER_H +#endif + #if MYSQL_VERSION_ID >= 50706 && !defined(MRN_MARIADB_P) # define MRN_HAVE_SPATIAL #elif defined(HAVE_SPATIAL) -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20190528/e1b996f1/attachment-0001.html>
