diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 13:25:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 13:25:02 +0100 |
| commit | 9bf8a68577c48bec2e9bdd86026dd7207d34f556 (patch) | |
| tree | be9bc20365d7e94bb15c2bdd7e78329e7dbbc14c | |
| parent | a0266bbdaed380f50fe61f9bef4538a969f2450e (diff) | |
| download | mariadb-git-9bf8a68577c48bec2e9bdd86026dd7207d34f556.tar.gz | |
disable connect tests for --embedded
| -rw-r--r-- | storage/connect/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/connect/mysql-test/connect/suite.pm | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt index 20fa68ea5a5..143ab0c621f 100644 --- a/storage/connect/CMakeLists.txt +++ b/storage/connect/CMakeLists.txt @@ -271,6 +271,7 @@ ENDIF(CONNECT_WITH_ODBC) MYSQL_ADD_PLUGIN(connect ${CONNECT_SOURCES} STORAGE_ENGINE COMPONENT connect-engine + RECOMPILE_FOR_EMBEDDED LINK_LIBRARIES ${ZLIB_LIBRARY} ${XML_LIBRARY} ${ICONV_LIBRARY} ${ODBC_LIBRARY} ${IPHLPAPI_LIBRARY}) diff --git a/storage/connect/mysql-test/connect/suite.pm b/storage/connect/mysql-test/connect/suite.pm index 3bbeffca7d9..2dabbc82e7d 100644 --- a/storage/connect/mysql-test/connect/suite.pm +++ b/storage/connect/mysql-test/connect/suite.pm @@ -5,6 +5,11 @@ package My::Suite::Connect; return "No CONNECT engine" unless $ENV{HA_CONNECT_SO} or $::mysqld_variables{'connect'} 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_CONNECT_SO}; + sub is_default { 1 } bless { }; |