Kouhei Sutou
null+****@clear*****
Tue Oct 23 21:29:03 JST 2012
Kouhei Sutou 2012-10-23 21:29:03 +0900 (Tue, 23 Oct 2012) New Revision: 90390a4350f72c71bff2228e85a1a08f04997249 https://github.com/mroonga/mroonga/commit/90390a4350f72c71bff2228e85a1a08f04997249 Log: Share type check macros Modified files: ha_mroonga.hpp mrn_mysql_compat.h Modified: ha_mroonga.hpp (+0 -6) =================================================================== --- ha_mroonga.hpp 2012-10-23 18:54:03 +0900 (c1e7504) +++ ha_mroonga.hpp 2012-10-23 21:29:03 +0900 (ab88d03) @@ -91,12 +91,6 @@ extern "C" { # define MRN_HA_ROWS_FORMAT "lu" #endif -#if MYSQL_VERSION_ID >= 50604 -# define MRN_HAVE_MYSQL_TYPE_TIMESTAMP2 -# define MRN_HAVE_MYSQL_TYPE_DATETIME2 -# define MRN_HAVE_MYSQL_TYPE_TIME2 -#endif - #if (MYSQL_VERSION_ID < 50519) || \ defined(MRN_MARIADB_P) || \ (50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID < 50604) Modified: mrn_mysql_compat.h (+6 -0) =================================================================== --- mrn_mysql_compat.h 2012-10-23 18:54:03 +0900 (ead0324) +++ mrn_mysql_compat.h 2012-10-23 21:29:03 +0900 (00e0d08) @@ -29,6 +29,12 @@ # define mysql_mutex_unlock(mutex) pthread_mutex_unlock(mutex) #endif +#if MYSQL_VERSION_ID >= 50604 +# define MRN_HAVE_MYSQL_TYPE_TIMESTAMP2 +# define MRN_HAVE_MYSQL_TYPE_DATETIME2 +# define MRN_HAVE_MYSQL_TYPE_TIME2 +#endif + #ifndef HA_INPLACE_ADD_INDEX_NO_READ_WRITE # define HA_INPLACE_ADD_INDEX_NO_READ_WRITE HA_ONLINE_ADD_INDEX_NO_WRITES # define HA_INPLACE_DROP_INDEX_NO_READ_WRITE HA_ONLINE_DROP_INDEX_NO_WRITES -------------- next part -------------- HTML����������������������������...Download