null+****@clear*****
null+****@clear*****
2011年 12月 22日 (木) 07:56:22 JST
Kouhei Sutou 2011-12-21 22:56:22 +0000 (Wed, 21 Dec 2011)
New Revision: 9377e12f729e4c12c61ee789e7e4ca2b2d870e42
Log:
Revert "fix build errors for MySQL 5.6.3. refs #1223"
This reverts commit 174c7b37cd064cf63ce846c5f1999f3c332da8a4.
Modified files:
ha_mroonga.h
mrn_mysql_compat.h
Modified: ha_mroonga.h (+1 -1)
===================================================================
--- ha_mroonga.h 2011-12-21 16:11:18 +0000 (e273f17)
+++ ha_mroonga.h 2011-12-21 22:56:22 +0000 (d0457fd)
@@ -57,7 +57,7 @@ extern "C" {
# define MRN_HANDLER_HAVE_HA_INDEX_NEXT_SAME 1
#endif
-#if (MYSQL_VERSION_ID >= 50603) || \
+#if (MYSQL_VERSION_ID >= 50604) || \
(defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50302)
# define MRN_HANDLER_HAVE_HA_CLOSE 1
# define MRN_HANDLER_HAVE_MULTI_RANGE_READ 1
Modified: mrn_mysql_compat.h (+2 -2)
===================================================================
--- mrn_mysql_compat.h 2011-12-21 16:11:18 +0000 (ea7ebc6)
+++ mrn_mysql_compat.h 2011-12-21 22:56:22 +0000 (01b86d0)
@@ -48,11 +48,11 @@
typedef MYSQL_ERROR Sql_condition;
#endif
-#if (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50302) || MYSQL_VERSION_ID >= 50603
+#if (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50302)
typedef COST_VECT Cost_estimate;
#endif
-#if (MYSQL_VERSION_ID >= 50516 && MYSQL_VERSION_ID < 50600) || MYSQL_VERSION_ID >= 50604
+#if MYSQL_VERSION_ID >= 50516
# define MRN_PLUGIN_HAVE_FLAGS 1
#endif