From fd1d6969e6e49fe2634803bb66fe1f1348789747 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Tue, 4 Aug 2020 12:09:30 +1000 Subject: [PATCH] MDEV-23362: s3 - link to zlib The function uncompress from the zlib libraries is used in s3_get_object in s3_func.c. --- storage/maria/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/maria/CMakeLists.txt b/storage/maria/CMakeLists.txt index d2c498e84be..0b71a94977a 100644 --- a/storage/maria/CMakeLists.txt +++ b/storage/maria/CMakeLists.txt @@ -118,12 +118,12 @@ ENDIF() IF (CURL_FOUND) LINK_DIRECTORIES(${PC_CURL_LIBDIR}) MYSQL_ADD_PLUGIN(s3 ha_s3.cc ${S3_SOURCES} COMPONENT s3-engine - LINK_LIBRARIES curl STORAGE_ENGINE NOT_EMBEDDED CONFIG s3.cnf) + LINK_LIBRARIES curl zlib STORAGE_ENGINE NOT_EMBEDDED CONFIG s3.cnf) ENDIF() IF(TARGET s3) MYSQL_ADD_EXECUTABLE(aria_s3_copy aria_s3_copy.cc ${S3_SOURCES} COMPONENT s3-engine) - TARGET_LINK_LIBRARIES(aria_s3_copy aria myisam mysys mysys_ssl curl) + TARGET_LINK_LIBRARIES(aria_s3_copy aria myisam mysys mysys_ssl curl zlib) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libmarias3) ADD_DEFINITIONS(-DWITH_S3_STORAGE_ENGINE) ENDIF()