diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-26 20:11:00 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-26 20:11:00 +0100 |
| commit | f19b5f4e1b9d439d20558be5dc8e4ef1ee8e7e9f (patch) | |
| tree | fbfdb6619e3959e113ecaa542438f824216a01c1 | |
| parent | 15ee97214da759f5b30232081fb71331d9369102 (diff) | |
| download | mariadb-git-f19b5f4e1b9d439d20558be5dc8e4ef1ee8e7e9f.tar.gz | |
OQGraph fails in --embedded
| -rw-r--r-- | storage/oqgraph/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/oqgraph/mysql-test/oqgraph/suite.pm | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/storage/oqgraph/CMakeLists.txt b/storage/oqgraph/CMakeLists.txt index 3f592133969..0c361e27707 100644 --- a/storage/oqgraph/CMakeLists.txt +++ b/storage/oqgraph/CMakeLists.txt @@ -51,6 +51,7 @@ IF(BOOST_OK) oqgraph_shim.cc oqgraph_thunk.cc oqgraph_judy.cc STORAGE_ENGINE MODULE_ONLY + RECOMPILE_FOR_EMBEDDED COMPONENT oqgraph-engine LINK_LIBRARIES ${Judy_LIBRARIES}) MESSAGE(STATUS "OQGraph OK") diff --git a/storage/oqgraph/mysql-test/oqgraph/suite.pm b/storage/oqgraph/mysql-test/oqgraph/suite.pm index 172c71c0e4c..118ecfa7c60 100644 --- a/storage/oqgraph/mysql-test/oqgraph/suite.pm +++ b/storage/oqgraph/mysql-test/oqgraph/suite.pm @@ -5,6 +5,9 @@ package My::Suite::OQGraph; return "No OQGraph" unless $ENV{HA_OQGRAPH_SO} or $::mysqld_variables{'oqgraph'} eq "ON"; +# as long as OQGraph defines MYSQL_SERVER it cannot run in embedded +return "Not run for embedded server" if $::opt_embedded_server; + sub is_default { 1 } bless { }; |