shibakentoku
null+****@clear*****
Wed May 28 01:42:55 JST 2014
shibakentoku 2014-05-28 01:42:55 +0900 (Wed, 28 May 2014) New Revision: 6871f9a659d1a71882e7e23558b7a88a6b3fdb92 https://github.com/mroonga/mroonga/commit/6871f9a659d1a71882e7e23558b7a88a6b3fdb92 Message: Add loading Mroonga at starting MariaDB. Added files: mysql-test/mroonga/storage/suite.opt mysql-test/mroonga/wrapper/suite.opt 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 (+3 -2) =================================================================== --- mysql-test/mroonga/include/mroonga/have_mroonga.inc 2014-05-28 01:37:17 +0900 (d1d81e6) +++ mysql-test/mroonga/include/mroonga/have_mroonga.inc 2014-05-28 01:42:55 +0900 (3c8832e) @@ -1,5 +1,5 @@ # Copyright(C) 2010 Tetsuro IKEDA -# Copyright(C) 2013 Kentoku SHIBA +# Copyright(C) 2013-2014 Kentoku SHIBA # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,7 +19,8 @@ disable_query_log; -if (!`SELECT 1 FROM information_schema.plugins WHERE plugin_name = "mroonga"`) { +let have_mroonga_storage_engine=`SELECT 1 FROM information_schema.plugins WHERE plugin_name = "mroonga"`; +if (!$have_mroonga_storage_engine) { eval INSTALL PLUGIN mroonga SONAME $ha_mroonga_so; eval INSTALL PLUGIN mroonga_stats SONAME $ha_mroonga_so; } Modified: mysql-test/mroonga/include/mroonga/have_mroonga_deinit.inc (+5 -3) =================================================================== --- mysql-test/mroonga/include/mroonga/have_mroonga_deinit.inc 2014-05-28 01:37:17 +0900 (ddfd58a) +++ mysql-test/mroonga/include/mroonga/have_mroonga_deinit.inc 2014-05-28 01:42:55 +0900 (f1d1e9d) @@ -1,4 +1,4 @@ -# Copyright(C) 2010 Kentoku SHIBA +# Copyright(C) 2010-2014 Kentoku SHIBA # Copyright(C) 2011 Kouhei Sutou <kou �� clear-code.com> # # This library is free software; you can redistribute it and/or @@ -28,7 +28,9 @@ if ($have_default_tmp_storage_engine_variable) { set default_tmp_storage_engine=MyISAM; } -UNINSTALL PLUGIN mroonga_stats; -UNINSTALL PLUGIN mroonga; +if (!$have_mroonga_storage_engine) { + UNINSTALL PLUGIN mroonga_stats; + UNINSTALL PLUGIN mroonga; +} enable_query_log; Added: mysql-test/mroonga/storage/suite.opt (+1 -0) 100644 =================================================================== --- /dev/null +++ mysql-test/mroonga/storage/suite.opt 2014-05-28 01:42:55 +0900 (2197af1) @@ -0,0 +1 @@ +--plugin-load-add=$HA_MROONGA_SO --plugin-mroonga=ON Added: mysql-test/mroonga/wrapper/suite.opt (+1 -0) 100644 =================================================================== --- /dev/null +++ mysql-test/mroonga/wrapper/suite.opt 2014-05-28 01:42:55 +0900 (2197af1) @@ -0,0 +1 @@ +--plugin-load-add=$HA_MROONGA_SO --plugin-mroonga=ON -------------- next part -------------- HTML����������������������������...Download