diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-28 10:00:31 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-28 10:00:31 +0100 |
| commit | 41c760b121494de2c6d58f8c1a600d599ad4e0a5 (patch) | |
| tree | a80a0f7316ffa843437ad24fc0ba7fbd4ee09e14 /storage/oqgraph | |
| parent | 57cdc561fc2b97c3d1d2b318fc0fa2410568c3d6 (diff) | |
| parent | 8d0238a6d8d641939730bdcd1ac4928b2c3c413d (diff) | |
| download | mariadb-git-41c760b121494de2c6d58f8c1a600d599ad4e0a5.tar.gz | |
merge
Diffstat (limited to 'storage/oqgraph')
| -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 { }; |