Share type check macros

mroonga · Oct 23, 2012 · 90390a4 · 90390a4
1 parent 775ba7e
commit 90390a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ha_mroonga.hpp b/ha_mroonga.hpp
@@ -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)

diff --git a/mrn_mysql_compat.h b/mrn_mysql_compat.h
@@ -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