diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-05-05 16:28:23 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-05-05 16:28:23 +0200 |
| commit | 93047370a6c4c73e11a28a4e1317284cc6e63aec (patch) | |
| tree | 1af7966efa3ca180abe6d63fb2338580329b578e | |
| parent | 1d3ea9ecd8c7f7e022eb4ee5e98326fc850d59b1 (diff) | |
| download | mariadb-git-93047370a6c4c73e11a28a4e1317284cc6e63aec.tar.gz | |
mroonga doesn't work in embedded anymore
specify RECOMPILE_FOR_EMBEDDED and disable tests in suite.pm
| -rw-r--r-- | storage/mroonga/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/mroonga/mysql-test/mroonga/storage/suite.pm | 5 | ||||
| -rw-r--r-- | storage/mroonga/mysql-test/mroonga/wrapper/suite.pm | 5 |
3 files changed, 11 insertions, 0 deletions
diff --git a/storage/mroonga/CMakeLists.txt b/storage/mroonga/CMakeLists.txt index 00aec7b874d..8b591178caa 100644 --- a/storage/mroonga/CMakeLists.txt +++ b/storage/mroonga/CMakeLists.txt @@ -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}) diff --git a/storage/mroonga/mysql-test/mroonga/storage/suite.pm b/storage/mroonga/mysql-test/mroonga/storage/suite.pm index 528ccc5d693..6b345c0fd6f 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/suite.pm +++ b/storage/mroonga/mysql-test/mroonga/storage/suite.pm @@ -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'; diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/suite.pm b/storage/mroonga/mysql-test/mroonga/wrapper/suite.pm index 528ccc5d693..b6e2d741674 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/suite.pm +++ b/storage/mroonga/mysql-test/mroonga/wrapper/suite.pm @@ -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 } |