database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-7450 key management plugins don't work with yassl

Browse Source 
workaround, not a fix: don't build key management plugins in yassl builds
This commit is contained in:
Sergei Golubchik
2015-02-04 17:09:43 +01:00
parent d78a53ec43
commit 1c801650f8
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/plugins/t/show_all_plugins.test
View File

@ -2,6 +2,7 @@ if (!$DIALOG_EXAMPLES_SO) { skip requires dialog_examples.so; }
if (!$HA_EXAMPLE_SO) { skip requires ha_examples.so; } if (!$HA_EXAMPLE_SO) { skip requires ha_examples.so; }
if (!$LIBDAEMON_EXAMPLE_SO) { skip requires libdaemon_examples.so; } if (!$LIBDAEMON_EXAMPLE_SO) { skip requires libdaemon_examples.so; }
if (!$UDF_EXAMPLE_SO) { skip requires udf_example.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; flush status;
show status like '%libraries%'; show status like '%libraries%';

2
plugin/example_key_management_plugin/CMakeLists.txt
View File

@ -1,2 +1,2 @@
MYSQL_ADD_PLUGIN(EXAMPLE_KEY_MANAGEMENT_PLUGIN example_key_management_plugin.cc MYSQL_ADD_PLUGIN(EXAMPLE_KEY_MANAGEMENT_PLUGIN example_key_management_plugin.cc
MODULE_ONLY) MODULE_ONLY ONLY_IF HAVE_EncryptAes128Ctr)

6
plugin/file_key_management_plugin/CMakeLists.txt
View File

@ -1,4 +1,8 @@
SET(FILE_KEY_MANAGEMENT_PLUGIN_SOURCES file_key_management_plugin.cc EncKeys.cc KeySingleton.cc) 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} MYSQL_ADD_PLUGIN(FILE_KEY_MANAGEMENT_PLUGIN ${FILE_KEY_MANAGEMENT_PLUGIN_SOURCES}
LINK_LIBRARIES pcre) LINK_LIBRARIES pcre ONLY_IF USING_OPENSSL)