diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-04 17:09:43 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-10 10:21:19 +0100 |
| commit | 1c801650f83c285dc6bcf9ab26d0847b1de07333 (patch) | |
| tree | 61a6e9c4196b65e21fa53fc1e5bb76be0714fb8e | |
| parent | d78a53ec43835798eb950e781e1423b2a5b3a217 (diff) | |
| download | mariadb-git-1c801650f83c285dc6bcf9ab26d0847b1de07333.tar.gz | |
MDEV-7450 key management plugins don't work with yassl
workaround, not a fix: don't build key management plugins in yassl builds
| -rw-r--r-- | mysql-test/suite/plugins/t/show_all_plugins.test | 1 | ||||
| -rw-r--r-- | plugin/example_key_management_plugin/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugin/file_key_management_plugin/CMakeLists.txt | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/suite/plugins/t/show_all_plugins.test b/mysql-test/suite/plugins/t/show_all_plugins.test index 68928bc2b3b..5d57def449b 100644 --- a/mysql-test/suite/plugins/t/show_all_plugins.test +++ b/mysql-test/suite/plugins/t/show_all_plugins.test @@ -2,6 +2,7 @@ if (!$DIALOG_EXAMPLES_SO) { skip requires dialog_examples.so; } if (!$HA_EXAMPLE_SO) { skip requires ha_examples.so; } if (!$LIBDAEMON_EXAMPLE_SO) { skip requires libdaemon_examples.so; } if (!$UDF_EXAMPLE_SO) { skip requires udf_example.so; } +if (!$EXAMPLE_KEY_MANAGEMENT_PLUGIN_SO) { skip requires example_key_management_plugin_so; } flush status; show status like '%libraries%'; diff --git a/plugin/example_key_management_plugin/CMakeLists.txt b/plugin/example_key_management_plugin/CMakeLists.txt index 95ff433dc43..dbceb0fed8b 100644 --- a/plugin/example_key_management_plugin/CMakeLists.txt +++ b/plugin/example_key_management_plugin/CMakeLists.txt @@ -1,2 +1,2 @@ MYSQL_ADD_PLUGIN(EXAMPLE_KEY_MANAGEMENT_PLUGIN example_key_management_plugin.cc - MODULE_ONLY) + MODULE_ONLY ONLY_IF HAVE_EncryptAes128Ctr) diff --git a/plugin/file_key_management_plugin/CMakeLists.txt b/plugin/file_key_management_plugin/CMakeLists.txt index 87e885c3550..91f11aeef45 100644 --- a/plugin/file_key_management_plugin/CMakeLists.txt +++ b/plugin/file_key_management_plugin/CMakeLists.txt @@ -1,4 +1,8 @@ SET(FILE_KEY_MANAGEMENT_PLUGIN_SOURCES file_key_management_plugin.cc EncKeys.cc KeySingleton.cc) +IF(NOT SSL_SOURCES) + SET(USING_OPENSSL ON) +ENDIF() + MYSQL_ADD_PLUGIN(FILE_KEY_MANAGEMENT_PLUGIN ${FILE_KEY_MANAGEMENT_PLUGIN_SOURCES} - LINK_LIBRARIES pcre) + LINK_LIBRARIES pcre ONLY_IF USING_OPENSSL) |