Skip to content

Commit 9304737

Browse files
committed
mroonga doesn't work in embedded anymore
specify RECOMPILE_FOR_EMBEDDED and disable tests in suite.pm
1 parent 1d3ea9e commit 9304737

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

storage/mroonga/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ if(MRN_BUNDLED)
319319
mysql_add_plugin(mroonga
320320
${MRN_ALL_SOURCES}
321321
STORAGE_ENGINE MODULE_ONLY
322+
RECOMPILE_FOR_EMBEDDED
322323
LINK_LIBRARIES ${MRN_LIBRARIES})
323324
else()
324325
add_library(mroonga MODULE ${MRN_ALL_SOURCES})

storage/mroonga/mysql-test/mroonga/storage/suite.pm

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ package My::Suite::Mroonga;
55
return "No Mroonga engine" unless $ENV{HA_MROONGA_SO} or
66
$::mysqld_variables{'mroonga'} eq "ON";
77

8+
# RECOMPILE_FOR_EMBEDDED also means that a plugin
9+
# cannot be dynamically loaded into embedded
10+
return "Not run for embedded server" if $::opt_embedded_server and
11+
$ENV{HA_MROONGA_SO};
12+
813
sub is_default { 1 }
914

1015
my $groonga_normalizer_mysql_dir=$::basedir . '/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql';

storage/mroonga/mysql-test/mroonga/wrapper/suite.pm

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ package My::Suite::Mroonga;
44

55
return "No Mroonga engine" unless $ENV{HA_MROONGA_SO} or
66
$::mysqld_variables{'mroonga'} eq "ON";
7+
#
8+
# RECOMPILE_FOR_EMBEDDED also means that a plugin
9+
# cannot be dynamically loaded into embedded
10+
return "Not run for embedded server" if $::opt_embedded_server and
11+
$ENV{HA_MROONGA_SO};
712

813
sub is_default { 1 }
914

0 commit comments

Comments
 (0)