Kouhei Sutou
null+****@clear*****
Thu Oct 4 11:23:33 JST 2012
Kouhei Sutou 2011-11-02 11:37:00 +0900 (Wed, 02 Nov 2011) New Revision: ed6ea4dedb6c6fd52e39ff49ee258f90836d33ea https://github.com/mroonga/mroonga/commit/ed6ea4dedb6c6fd52e39ff49ee258f90836d33ea Log: [mariadb5.2] make buildable. fixes #1152 Reported by Kazuhiko Shiozaki. Thanks!!! Modified files: ha_mroonga.h test/run-sql-test.sh Modified: ha_mroonga.h (+5 -2) =================================================================== --- ha_mroonga.h 2011-11-01 00:37:35 +0900 (05594f8) +++ ha_mroonga.h 2011-11-02 11:37:00 +0900 (4a66d83) @@ -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 Modified: test/run-sql-test.sh (+1 -1) =================================================================== --- test/run-sql-test.sh 2011-11-01 00:37:35 +0900 (aa38af1) +++ test/run-sql-test.sh 2011-11-02 11:37:00 +0900 (d109639) @@ -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 -------------- next part -------------- HTML����������������������������...Download