test: ensure restoring the original default storage engine

mroonga · Jul 21, 2014 · e7be753 · e7be753
1 parent c4126aa
commit e7be753
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/mysql-test/mroonga/include/mroonga/have_mroonga.inc b/mysql-test/mroonga/include/mroonga/have_mroonga.inc
@@ -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;
diff --git a/mysql-test/mroonga/include/mroonga/have_mroonga_deinit.inc b/mysql-test/mroonga/include/mroonga/have_mroonga_deinit.inc
@@ -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) {