[mariadb5.2] make buildable. fixes #1152

Reported by Kazuhiko Shiozaki. Thanks!!!
mroonga · Nov 2, 2011 · ed6ea4d · ed6ea4d
1 parent 3345884
commit ed6ea4d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/ha_mroonga.h b/ha_mroonga.h
@@ -48,8 +48,7 @@ extern "C" {
 #endif
 
 #if (MYSQL_VERSION_ID >= 50603) || \
-    (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50302)
-#  define MRN_HANDLER_HAVE_HA_CLOSE 1
+    (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50209)
 #  define MRN_HANDLER_HAVE_HA_RND_NEXT 1
 #  define MRN_HANDLER_HAVE_HA_RND_POS 1
 #  define MRN_HANDLER_HAVE_HA_INDEX_READ_MAP 1
@@ -59,7 +58,11 @@ extern "C" {
 #  define MRN_HANDLER_HAVE_HA_INDEX_FIRST 1
 #  define MRN_HANDLER_HAVE_HA_INDEX_LAST 1
 #  define MRN_HANDLER_HAVE_HA_INDEX_NEXT_SAME 1
+#endif
 
+#if (MYSQL_VERSION_ID >= 50603) || \
+    (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50302)
+#  define MRN_HANDLER_HAVE_HA_CLOSE 1
 #  define MRN_HANDLER_HAVE_MULTI_RANGE_READ 1
 #endif
 

diff --git a/test/run-sql-test.sh b/test/run-sql-test.sh
@@ -30,7 +30,7 @@ case "${MYSQL_VERSION}" in
 	    mkdir -p "${build_test_suites_dir}"
 	fi
 	;;
-    5.3.*-MariaDB*)
+    *-MariaDB*)
 	if ! test -d "${build_test_suites_dir}"; then
 	    ln -s "${source_test_suites_dir}" "${build_test_suites_dir}"
 	fi