mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Merge 10.1 into 10.2
Also, include fixes by Vladislav Vaintroub to the aws_key_management plugin. The AWS C++ SDK specifically depends on OPENSSL_LIBRARIES, not generic SSL_LIBRARIES (such as YaSSL).
This commit is contained in:
@ -34,6 +34,6 @@ SET(HANDLERSOCKET_SOURCES
|
||||
MYSQL_ADD_PLUGIN(handlersocket
|
||||
${HANDLERSOCKET_SOURCES}
|
||||
MODULE_ONLY COMPONENT Server
|
||||
LINK_LIBRARIES hsclient
|
||||
LINK_LIBRARIES hsclient RECOMPILE_FOR_EMBEDDED
|
||||
)
|
||||
|
||||
|
Reference in New Issue
Block a user