Skip to content

Commit 1c80165

Browse files
committed
MDEV-7450 key management plugins don't work with yassl
workaround, not a fix: don't build key management plugins in yassl builds
1 parent d78a53e commit 1c80165

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

mysql-test/suite/plugins/t/show_all_plugins.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ if (!$DIALOG_EXAMPLES_SO) { skip requires dialog_examples.so; }
22
if (!$HA_EXAMPLE_SO) { skip requires ha_examples.so; }
33
if (!$LIBDAEMON_EXAMPLE_SO) { skip requires libdaemon_examples.so; }
44
if (!$UDF_EXAMPLE_SO) { skip requires udf_example.so; }
5+
if (!$EXAMPLE_KEY_MANAGEMENT_PLUGIN_SO) { skip requires example_key_management_plugin_so; }
56

67
flush status;
78
show status like '%libraries%';
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
MYSQL_ADD_PLUGIN(EXAMPLE_KEY_MANAGEMENT_PLUGIN example_key_management_plugin.cc
2-
MODULE_ONLY)
2+
MODULE_ONLY ONLY_IF HAVE_EncryptAes128Ctr)
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
SET(FILE_KEY_MANAGEMENT_PLUGIN_SOURCES file_key_management_plugin.cc EncKeys.cc KeySingleton.cc)
22

3+
IF(NOT SSL_SOURCES)
4+
SET(USING_OPENSSL ON)
5+
ENDIF()
6+
37
MYSQL_ADD_PLUGIN(FILE_KEY_MANAGEMENT_PLUGIN ${FILE_KEY_MANAGEMENT_PLUGIN_SOURCES}
4-
LINK_LIBRARIES pcre)
8+
LINK_LIBRARIES pcre ONLY_IF USING_OPENSSL)

0 commit comments

Comments
 (0)