Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:27:33 JST 2012
Kouhei Sutou 2011-08-12 11:49:57 +0900 (Fri, 12 Aug 2011) New Revision: 8c4e6ce2d58ba06fceda4820cfebd9c710764754 https://github.com/mroonga/mroonga/commit/8c4e6ce2d58ba06fceda4820cfebd9c710764754 Log: [test] use default_storage_engine variable in MySQL 5.6. refs #1046 Modified files: test/sql/groonga_include/groonga_deinit.inc test/sql/groonga_include/groonga_init.inc Modified: test/sql/groonga_include/groonga_deinit.inc (+11 -1) =================================================================== --- test/sql/groonga_include/groonga_deinit.inc 2011-08-12 11:16:46 +0900 (e61eb6d) +++ test/sql/groonga_include/groonga_deinit.inc 2011-08-12 11:49:57 +0900 (3827d6b) @@ -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; Modified: test/sql/groonga_include/groonga_init.inc (+13 -2) =================================================================== --- test/sql/groonga_include/groonga_init.inc 2011-08-12 11:16:46 +0900 (e45e2f9) +++ test/sql/groonga_include/groonga_init.inc 2011-08-12 11:49:57 +0900 (acbdcb8) @@ -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; -------------- next part -------------- HTML����������������������������...Download