diff options
| author | Monty <monty@mariadb.org> | 2020-04-23 16:25:10 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-05-23 12:29:09 +0300 |
| commit | 8cf166bfb2f7791d5f5e5b419bbcc4a2fcbb221f (patch) | |
| tree | d110be5ecd0f1b049583d58f55eed2967e68370e /storage | |
| parent | 51f0fa4eb375334857f9e03b5262e9cda57f92d2 (diff) | |
| download | mariadb-git-8cf166bfb2f7791d5f5e5b419bbcc4a2fcbb221f.tar.gz | |
Update libmarias3 to fix a memory leak
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/maria/CMakeLists.txt | 10 | ||||
| m--------- | storage/maria/libmarias3 | 0 |
2 files changed, 5 insertions, 5 deletions
diff --git a/storage/maria/CMakeLists.txt b/storage/maria/CMakeLists.txt index 7e84bf67860..9ca5d3f6109 100644 --- a/storage/maria/CMakeLists.txt +++ b/storage/maria/CMakeLists.txt @@ -135,16 +135,15 @@ SET(CURL_SSL_TEST_SOURCE "\n SET(S3_SOURCES ha_s3.cc s3_func.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/sha256-internal.c) + libmarias3/src/sha256-internal.c libmarias3/src/xml.c) IF(NOT PLUGIN_S3 STREQUAL NO) - FIND_PACKAGE(LibXml2) FIND_PACKAGE(CURL) ENDIF() -IF (LIBXML2_FOUND AND CURL_FOUND) +IF (CURL_FOUND) 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) ENDIF() @@ -155,7 +154,8 @@ IF(TARGET s3) MYSQL_ADD_EXECUTABLE(aria_s3_copy aria_s3_copy.cc COMPONENT Server) 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) IF (FOUND_SAFE_CURL_SSL) MESSAGE(STATUS "Found thread safe curl ssl") diff --git a/storage/maria/libmarias3 b/storage/maria/libmarias3 -Subproject fe0869eb40b13c361454c44cebe6f889b52535c +Subproject 8727cf74fd9fe641ee1b200486036f311e2bd09 |