Skip to content
Permalink
Browse files

mroonga doesn't work in embedded anymore

specify RECOMPILE_FOR_EMBEDDED and disable tests in suite.pm
  • Loading branch information...
vuvova committed May 5, 2015
1 parent 1d3ea9e commit 93047370a6c4c73e11a28a4e1317284cc6e63aec
@@ -319,6 +319,7 @@ if(MRN_BUNDLED)
mysql_add_plugin(mroonga
${MRN_ALL_SOURCES}
STORAGE_ENGINE MODULE_ONLY
RECOMPILE_FOR_EMBEDDED
LINK_LIBRARIES ${MRN_LIBRARIES})
else()
add_library(mroonga MODULE ${MRN_ALL_SOURCES})
@@ -5,6 +5,11 @@ package My::Suite::Mroonga;
return "No Mroonga engine" unless $ENV{HA_MROONGA_SO} or
$::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 }

my $groonga_normalizer_mysql_dir=$::basedir . '/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql';
@@ -4,6 +4,11 @@ package My::Suite::Mroonga;

return "No Mroonga engine" unless $ENV{HA_MROONGA_SO} or
$::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 }

0 comments on commit 9304737

Please sign in to comment.
You can’t perform that action at this time.