Browse Source

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

workaround, not a fix: don't build key management plugins in yassl builds
pull/16/merge
Sergei Golubchik 11 years ago
parent
commit
1c801650f8
  1. 1
      mysql-test/suite/plugins/t/show_all_plugins.test
  2. 2
      plugin/example_key_management_plugin/CMakeLists.txt
  3. 6
      plugin/file_key_management_plugin/CMakeLists.txt

1
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%';

2
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)

6
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)
Loading…
Cancel
Save