Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:32:09 JST 2012
Kouhei Sutou 2011-11-21 13:31:30 +0900 (Mon, 21 Nov 2011) New Revision: be4c4f18f10cae61bd284373f21b8b3662656957 https://github.com/mroonga/mroonga/commit/be4c4f18f10cae61bd284373f21b8b3662656957 Log: support MySQL 5.3-labs-innodb-fts again. fixes #1176 Reported by Toshihisa Tashiro. Thanks!!! Modified files: configure.ac ha_mroonga.h Modified: configure.ac (+9 -0) =================================================================== --- configure.ac 2011-11-21 10:42:45 +0900 (cedf964) +++ configure.ac 2011-11-21 13:31:30 +0900 (c0b34d9) @@ -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],[ Modified: ha_mroonga.h (+1 -1) =================================================================== --- ha_mroonga.h 2011-11-21 10:42:45 +0900 (dc12162) +++ ha_mroonga.h 2011-11-21 13:31:30 +0900 (5b11fab) @@ -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 -------------- next part -------------- HTML����������������������������...Download