[test] use default_storage_engine variable in MySQL 5.6. refs #1046

mroonga · Aug 12, 2011 · 8c4e6ce · 8c4e6ce
1 parent a175922
commit 8c4e6ce
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/test/sql/groonga_include/groonga_deinit.inc b/test/sql/groonga_include/groonga_deinit.inc
@@ -15,7 +15,17 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 disable_query_log;
-set storage_engine=MyISAM;
+
+if ($have_default_storage_engine_variable)
+{
+  set default_storage_engine=MyISAM;
+}
+if (!$have_default_storage_engine_variable)
+{
+  set storage_engine=MyISAM;
+}
+
 UNINSTALL PLUGIN groonga_stats;
 UNINSTALL PLUGIN groonga;
+
 enable_query_log;
diff --git a/test/sql/groonga_include/groonga_init.inc b/test/sql/groonga_include/groonga_init.inc
@@ -15,10 +15,21 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 disable_query_log;
-if (!`SELECT 1 FROM information_schema.plugins WHERE plugin_name="groonga"`)
+
+if (!`SELECT 1 FROM information_schema.plugins WHERE plugin_name = "groonga"`)
 {
   INSTALL PLUGIN groonga SONAME 'ha_groonga.so';
   INSTALL PLUGIN groonga_stats SONAME 'ha_groonga.so';
 }
-set storage_engine=groonga;
+
+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=groonga;
+}
+if (!$have_default_storage_engine_variable)
+{
+  set storage_engine=groonga;
+}
+
 enable_query_log;