Commit 93047370 authored by Sergei Golubchik's avatar Sergei Golubchik

mroonga doesn't work in embedded anymore

specify RECOMPILE_FOR_EMBEDDED and disable tests in suite.pm
parent 1d3ea9ec
...@@ -319,6 +319,7 @@ if(MRN_BUNDLED) ...@@ -319,6 +319,7 @@ if(MRN_BUNDLED)
mysql_add_plugin(mroonga mysql_add_plugin(mroonga
${MRN_ALL_SOURCES} ${MRN_ALL_SOURCES}
STORAGE_ENGINE MODULE_ONLY STORAGE_ENGINE MODULE_ONLY
RECOMPILE_FOR_EMBEDDED
LINK_LIBRARIES ${MRN_LIBRARIES}) LINK_LIBRARIES ${MRN_LIBRARIES})
else() else()
add_library(mroonga MODULE ${MRN_ALL_SOURCES}) add_library(mroonga MODULE ${MRN_ALL_SOURCES})
......
...@@ -5,6 +5,11 @@ package My::Suite::Mroonga; ...@@ -5,6 +5,11 @@ package My::Suite::Mroonga;
return "No Mroonga engine" unless $ENV{HA_MROONGA_SO} or return "No Mroonga engine" unless $ENV{HA_MROONGA_SO} or
$::mysqld_variables{'mroonga'} eq "ON"; $::mysqld_variables{'mroonga'} eq "ON";
# RECOMPILE_FOR_EMBEDDED also means that a plugin
# cannot be dynamically loaded into embedded
return "Not run for embedded server" if $::opt_embedded_server and
$ENV{HA_MROONGA_SO};
sub is_default { 1 } sub is_default { 1 }
my $groonga_normalizer_mysql_dir=$::basedir . '/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql'; my $groonga_normalizer_mysql_dir=$::basedir . '/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql';
......
...@@ -4,6 +4,11 @@ package My::Suite::Mroonga; ...@@ -4,6 +4,11 @@ package My::Suite::Mroonga;
return "No Mroonga engine" unless $ENV{HA_MROONGA_SO} or return "No Mroonga engine" unless $ENV{HA_MROONGA_SO} or
$::mysqld_variables{'mroonga'} eq "ON"; $::mysqld_variables{'mroonga'} eq "ON";
#
# RECOMPILE_FOR_EMBEDDED also means that a plugin
# cannot be dynamically loaded into embedded
return "Not run for embedded server" if $::opt_embedded_server and
$ENV{HA_MROONGA_SO};
sub is_default { 1 } sub is_default { 1 }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment