Commit 8cf166bf authored by Monty's avatar Monty

Update libmarias3 to fix a memory leak

parent 51f0fa4e
...@@ -135,16 +135,15 @@ SET(CURL_SSL_TEST_SOURCE "\n ...@@ -135,16 +135,15 @@ SET(CURL_SSL_TEST_SOURCE "\n
SET(S3_SOURCES ha_s3.cc s3_func.c SET(S3_SOURCES ha_s3.cc s3_func.c
libmarias3/src/debug.c libmarias3/src/error.c libmarias3/src/marias3.c libmarias3/src/debug.c libmarias3/src/error.c libmarias3/src/marias3.c
libmarias3/src/request.c libmarias3/src/response.c libmarias3/src/sha256.c libmarias3/src/request.c libmarias3/src/response.c libmarias3/src/sha256.c
libmarias3/src/sha256-internal.c) libmarias3/src/sha256-internal.c libmarias3/src/xml.c)
IF(NOT PLUGIN_S3 STREQUAL NO) IF(NOT PLUGIN_S3 STREQUAL NO)
FIND_PACKAGE(LibXml2)
FIND_PACKAGE(CURL) FIND_PACKAGE(CURL)
ENDIF() ENDIF()
IF (LIBXML2_FOUND AND CURL_FOUND) IF (CURL_FOUND)
MYSQL_ADD_PLUGIN(s3 ${S3_SOURCES} STORAGE_ENGINE STATIC_ONLY MYSQL_ADD_PLUGIN(s3 ${S3_SOURCES} STORAGE_ENGINE STATIC_ONLY
LINK_LIBRARIES aria myisam mysys mysys_ssl xml2 curl LINK_LIBRARIES aria myisam mysys mysys_ssl curl
NOT_EMBEDDED) NOT_EMBEDDED)
ENDIF() ENDIF()
...@@ -155,7 +154,8 @@ IF(TARGET s3) ...@@ -155,7 +154,8 @@ IF(TARGET s3)
MYSQL_ADD_EXECUTABLE(aria_s3_copy aria_s3_copy.cc COMPONENT Server) MYSQL_ADD_EXECUTABLE(aria_s3_copy aria_s3_copy.cc COMPONENT Server)
TARGET_LINK_LIBRARIES(aria_s3_copy s3) TARGET_LINK_LIBRARIES(aria_s3_copy s3)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libmarias3 ${LIBXML2_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libmarias3)
ADD_DEFINITIONS(-DWITH_S3_STORAGE_ENGINE) ADD_DEFINITIONS(-DWITH_S3_STORAGE_ENGINE)
IF (FOUND_SAFE_CURL_SSL) IF (FOUND_SAFE_CURL_SSL)
MESSAGE(STATUS "Found thread safe curl ssl") MESSAGE(STATUS "Found thread safe curl ssl")
......
Subproject commit fe0869eb40b13c361454c44cebe6f889b52535cb Subproject commit 8727cf74fd9fe641ee1b200486036f311e2bd09b
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment