support MySQL 5.3-labs-innodb-fts again. fixes #1176

Reported by Toshihisa Tashiro. Thanks!!!
mroonga · Nov 21, 2011 · be4c4f1 · be4c4f1
1 parent d979485
commit be4c4f1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/configure.ac b/configure.ac
@@ -92,6 +92,15 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[
   MYSQL_CFLAGS="$MYSQL_CFLAGS $($ac_mysql_config --cflags)"
   MYSQL_INC="$MYSQL_INC $($ac_mysql_config --include)"
   MYSQL_VERSION="$($ac_mysql_config --version)"
+
+  AC_MSG_CHECKING([for InnoDB FTS])
+  mrn_mysql_innodb_fts_p=no
+  if test x"$MYSQL_VERSION" == x"5.6.3-labs-innodb-fts"; then
+    mrn_mysql_innodb_fts_p=yes
+    AC_DEFINE([MRN_MYSQL_INNODB_FTS_P], [1],
+              [Define to 1 if the target MySQL has InnoDB FTS])
+  fi
+  AC_MSG_RESULT($mrn_mysql_innodb_fts_p)
 ])
 
 AC_DEFUN([CONFIG_OPTION_GROONGA],[

diff --git a/ha_mroonga.h b/ha_mroonga.h
@@ -82,7 +82,7 @@ extern "C" {
   typedef Item COND;
 #endif
 
-#if MYSQL_VERSION_ID < 50603
+#if MYSQL_VERSION_ID < 50603 || defined(MRN_MYSQL_INNODB_FTS_P)
   typedef MYSQL_ERROR Sql_condition;
 #endif