null+****@clear*****
null+****@clear*****
2011年 11月 26日 (土) 16:50:42 JST
Kouhei Sutou 2011-11-26 07:50:42 +0000 (Sat, 26 Nov 2011) New Revision: 8339deb5f385c109dbd100d49f808cb1bd29c00b Log: move MariaDB detect ifdef to mrn_mysql.h. Modified files: ha_mroonga.h mrn_mysql.h Modified: ha_mroonga.h (+0 -4) =================================================================== --- ha_mroonga.h 2011-11-26 07:50:25 +0000 (a6ad1d6) +++ ha_mroonga.h 2011-11-26 07:50:42 +0000 (33d4524) @@ -32,10 +32,6 @@ extern "C" { #include <groonga.h> #include "mrn_sys.h" -#ifdef MARIADB_BASE_VERSION -# define MRN_MARIADB_P 1 -#endif - #if (MYSQL_VERSION_ID >= 50603) || \ (MYSQL_VERSION_ID >= 50513 && MYSQL_VERSION_ID < 50600) || \ (MYSQL_VERSION_ID >= 50158 && MYSQL_VERSION_ID < 50500) Modified: mrn_mysql.h (+4 -0) =================================================================== --- mrn_mysql.h 2011-11-26 07:50:25 +0000 (41d4af8) +++ mrn_mysql.h 2011-11-26 07:50:42 +0000 (94c0925) @@ -53,6 +53,10 @@ # include <sql_partition.h> #endif +#ifdef MARIADB_BASE_VERSION +# define MRN_MARIADB_P 1 +#endif + #if MYSQL_VERSION_ID >= 50500 # define my_free(PTR, FLAG) my_free(PTR) #endif