1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-23362: s3 - link to zlib

Browse Source 
The function uncompress from the zlib libraries is used
in s3_get_object in s3_func.c.
This commit is contained in:
Daniel Black 2020-08-04 12:09:30 +10:00
parent c12d24e291
commit fd1d6969e6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/maria/CMakeLists.txt
View File

@ -118,12 +118,12 @@ ENDIF()
IF (CURL_FOUND) IF (CURL_FOUND)
LINK_DIRECTORIES(${PC_CURL_LIBDIR}) LINK_DIRECTORIES(${PC_CURL_LIBDIR})
MYSQL_ADD_PLUGIN(s3 ha_s3.cc ${S3_SOURCES} COMPONENT s3-engine 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() ENDIF()
IF(TARGET s3) IF(TARGET s3)
MYSQL_ADD_EXECUTABLE(aria_s3_copy aria_s3_copy.cc ${S3_SOURCES} COMPONENT s3-engine) 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) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libmarias3)
ADD_DEFINITIONS(-DWITH_S3_STORAGE_ENGINE) ADD_DEFINITIONS(-DWITH_S3_STORAGE_ENGINE)
ENDIF() ENDIF()