Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:42:28 JST 2012
Kouhei Sutou 2012-04-19 20:39:54 +0900 (Thu, 19 Apr 2012) New Revision: 2526129a4b907bd5d111b87bd2347812eae36eb1 https://github.com/mroonga/mroonga/commit/2526129a4b907bd5d111b87bd2347812eae36eb1 Merged d2a70dc: Merge branch 'master' of github.com:mroonga/mroonga Log: test: use storage/maria/ to detect MariaDB Modified files: test/run-sql-test.sh Modified: test/run-sql-test.sh (+10 -5) =================================================================== --- test/run-sql-test.sh 2012-04-19 20:19:14 +0900 (91596c7) +++ test/run-sql-test.sh 2012-04-19 20:39:54 +0900 (1779ac4) @@ -26,12 +26,17 @@ case "${MYSQL_VERSION}" in if ! test -d "${build_test_suites_dir}"; then ln -s "${source_test_suites_dir}" "${build_test_suites_dir}" fi - plugins_dir="${MYSQL_SOURCE_DIR}/lib/plugin" - if ! test -d "${plugins_dir}"; then - if ! test -d "${MYSQL_BUILD_DIR}/plugin/mroonga"; then - ln -s "${top_dir}" "${MYSQL_BUILD_DIR}/plugin/mroonga" - fi + maria_storage_dir="${MYSQL_SOURCE_DIR}/storage/maria" + if test -d "${maria_storage_dir}"; then + mariadb="yes" + else + mariadb="no" + fi + if test "${mariadb}" = "yes"; then + ln -s "${top_dir}" "${MYSQL_BUILD_DIR}/plugin/mroonga" plugins_dir= + else + plugins_dir="${MYSQL_SOURCE_DIR}/lib/plugin" fi ;; esac -------------- next part -------------- HTML����������������������������...Download