Kouhei Sutou
null+****@clear*****
Mon Jul 21 14:28:46 JST 2014
Kouhei Sutou 2014-07-21 14:28:46 +0900 (Mon, 21 Jul 2014) New Revision: e7be753c2696ea50bce0f90f9c62d1e7a84af04b https://github.com/mroonga/mroonga/commit/e7be753c2696ea50bce0f90f9c62d1e7a84af04b Message: test: ensure restoring the original default storage engine Modified files: mysql-test/mroonga/include/mroonga/have_mroonga.inc mysql-test/mroonga/include/mroonga/have_mroonga_deinit.inc Modified: mysql-test/mroonga/include/mroonga/have_mroonga.inc (+6 -3) =================================================================== --- mysql-test/mroonga/include/mroonga/have_mroonga.inc 2014-07-21 12:27:12 +0900 (3c8832e) +++ mysql-test/mroonga/include/mroonga/have_mroonga.inc 2014-07-21 14:28:46 +0900 (2ebec2d) @@ -27,15 +27,18 @@ if (!$have_mroonga_storage_engine) { let have_default_storage_engine_variable=`SELECT 1 FROM information_schema.global_variables WHERE variable_name = "default_storage_engine"`; if ($have_default_storage_engine_variable) { - set default_storage_engine=mroonga; + let original_default_storage_engine=`SELECT variable_value FROM information_schema.global_variables WHERE variable_name = "default_storage_engine"`; + set default_storage_engine=Mroonga; } if (!$have_default_storage_engine_variable) { - set storage_engine=mroonga; + let original_storage_engine=`SELECT variable_value FROM information_schema.global_variables WHERE variable_name = "storage_engine"`; + set storage_engine=Mroonga; } let have_default_tmp_storage_engine_variable=`SELECT 1 FROM information_schema.global_variables WHERE variable_name = "default_tmp_storage_engine"`; if ($have_default_tmp_storage_engine_variable) { - set default_tmp_storage_engine=mroonga; + let original_default_tmp_storage_engine=`SELECT variable_value FROM information_schema.global_variables WHERE variable_name = "default_tmp_storage_engine"`; + set default_tmp_storage_engine=Mroonga; } enable_query_log; Modified: mysql-test/mroonga/include/mroonga/have_mroonga_deinit.inc (+3 -3) =================================================================== --- mysql-test/mroonga/include/mroonga/have_mroonga_deinit.inc 2014-07-21 12:27:12 +0900 (f1d1e9d) +++ mysql-test/mroonga/include/mroonga/have_mroonga_deinit.inc 2014-07-21 14:28:46 +0900 (0b6b708) @@ -18,14 +18,14 @@ disable_query_log; if ($have_default_storage_engine_variable) { - set default_storage_engine=MyISAM; + eval set default_storage_engine=$original_default_storage_engine; } if (!$have_default_storage_engine_variable) { - set storage_engine=MyISAM; + eval set storage_engine=$original_storage_engine; } if ($have_default_tmp_storage_engine_variable) { - set default_tmp_storage_engine=MyISAM; + eval set default_tmp_storage_engine=$original_default_tmp_storage_engine; } if (!$have_mroonga_storage_engine) { -------------- next part -------------- HTML����������������������������...Download
