Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:27:24 JST 2012
Kouhei Sutou 2011-08-12 10:06:05 +0900 (Fri, 12 Aug 2011) New Revision: d6e4f5a3e412c4a9914ca609e88844b9564e0d39 https://github.com/mroonga/mroonga/commit/d6e4f5a3e412c4a9914ca609e88844b9564e0d39 Log: remove needless -DMYSQL51 macro. Modified files: configure.ac ha_mroonga.cc Modified: configure.ac (+0 -10) =================================================================== --- configure.ac 2011-08-12 10:04:14 +0900 (ef633b4) +++ configure.ac 2011-08-12 10:06:05 +0900 (7be9f46) @@ -73,16 +73,6 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[ AC_MSG_ERROR([failed to run "$ac_mysql_config": $plugindir]) fi MYSQL_INC="$MYSQL_INC $($ac_mysql_config --include)" - ac_mysql_major_version="`$ac_mysql_config --version | cut -b 1,3`" - MYSQL_CFLAGS="$MYSQL_CFLAGS $($ac_mysql_config --cflags)" - if test $ac_mysql_major_version -lt 55; then - MYSQL_VERSION_CFLAGS="-DMYSQL51" - AC_SUBST(MYSQL_VERSION_CFLAGS) - MYSQL_VERSION="5.1" - else - MYSQL_VERSION="5.5" - fi - AC_SUBST(MYSQL_VERSION) AC_SUBST(plugindir) ]) Modified: ha_mroonga.cc (+2 -2) =================================================================== --- ha_mroonga.cc 2011-08-12 10:04:14 +0900 (ded8179) +++ ha_mroonga.cc 2011-08-12 10:06:05 +0900 (0266cb4) @@ -38,10 +38,10 @@ #define MYSQL_SERVER 1 #include "mysql_version.h" -#ifdef MYSQL51 +#if MYSQL_VERSION_ID < 50500 # include <mysql_priv.h> # include <mysql/plugin.h> -#else /* MYSQL51 */ +#else # include <sql_priv.h> # include <sql_class.h> # include <probes_mysql.h> -------------- next part -------------- HTML����������������������������...Download