Kouhei Sutou
null+****@clear*****
Mon Jul 9 18:25:20 JST 2018
Kouhei Sutou 2018-07-09 18:25:20 +0900 (Mon, 09 Jul 2018) New Revision: 9e5f9b04a1e92c7ec0e77cfbe98051edfbaa8ac9 https://github.com/mroonga/mroonga/commit/9e5f9b04a1e92c7ec0e77cfbe98051edfbaa8ac9 Message: mysql8 test: stop to use information_schema.global_variables Modified files: mysql-test/mroonga/include/mroonga/have_mroonga.inc Modified: mysql-test/mroonga/include/mroonga/have_mroonga.inc (+4 -3) =================================================================== --- mysql-test/mroonga/include/mroonga/have_mroonga.inc 2018-07-09 18:23:20 +0900 (882ebebb) +++ mysql-test/mroonga/include/mroonga/have_mroonga.inc 2018-07-09 18:25:20 +0900 (6a5e14fc) @@ -17,6 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --source ../../include/mroonga/check_ha_mroonga_so.inc +--source ../../include/mroonga/check_version.inc disable_query_log; @@ -26,12 +27,12 @@ if (!$have_mroonga_storage_engine) { eval INSTALL PLUGIN mroonga_stats SONAME $ha_mroonga_so; } -let original_default_storage_engine=`SELECT @@GLOBAL.default_storage_engine`; +let original_default_storage_engine=`SELECT @@global.default_storage_engine`; set default_storage_engine=Mroonga; -let have_default_tmp_storage_engine_variable=`SELECT 1 FROM information_schema.global_variables WHERE variable_name = "default_tmp_storage_engine"`; +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 variable_value FROM information_schema.global_variables WHERE variable_name = "default_tmp_storage_engine"`; + let original_default_tmp_storage_engine=`SELECT @@global.default_tmp_storage_engine`; if (!$original_default_tmp_storage_engine) { let original_default_tmp_storage_engine=NULL; } -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180709/a0c6546d/attachment-0001.htm
