Kouhei Sutou
null+****@clear*****
Tue Jul 10 09:51:02 JST 2018
Kouhei Sutou 2018-07-10 09:51:02 +0900 (Tue, 10 Jul 2018) New Revision: 2e29c251cce76a5145db432ae90f2f982fdcf109 https://github.com/mroonga/mroonga/commit/2e29c251cce76a5145db432ae90f2f982fdcf109 Message: test: MraiaDB 10.0 doesn't support default_tmp_storage_engine Modified files: mysql-test/mroonga/include/mroonga/have_mroonga.inc Modified: mysql-test/mroonga/include/mroonga/have_mroonga.inc (+7 -1) =================================================================== --- mysql-test/mroonga/include/mroonga/have_mroonga.inc 2018-07-10 06:19:18 +0900 (6a5e14fc) +++ mysql-test/mroonga/include/mroonga/have_mroonga.inc 2018-07-10 09:51:02 +0900 (d278e97c) @@ -18,6 +18,7 @@ --source ../../include/mroonga/check_ha_mroonga_so.inc --source ../../include/mroonga/check_version.inc +--source ../../include/mroonga/check_mariadb.inc disable_query_log; @@ -30,7 +31,12 @@ if (!$have_mroonga_storage_engine) { let original_default_storage_engine=`SELECT @@global.default_storage_engine`; set default_storage_engine=Mroonga; -let have_default_tmp_storage_engine_variable=$version_5_6_or_later; +if ($mariadb) { + let have_default_tmp_storage_engine_variable=$version_10_2_or_later; +} +if (!$mariadb) { + let have_default_tmp_storage_engine_variable=$version_5_6_or_later; +} if ($have_default_tmp_storage_engine_variable) { let original_default_tmp_storage_engine=`SELECT @@global.default_tmp_storage_engine`; if (!$original_default_tmp_storage_engine) { -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180710/9223d94b/attachment-0001.htm
