Revert "fix build errors for MySQL 5.6.3. refs #1223"

This reverts commit 174c7b3.
mroonga · Dec 21, 2011 · 9377e12 · 9377e12
1 parent 174c7b3
commit 9377e12
Show file tree

Hide file tree

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

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