mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

update libmarias3

Browse source
This commit is contained in:
Sergei Golubchik 2020-06-14 15:43:30 +02:00
parent 7bb32cda05
commit 7c0cf20444
2 changed files with 1 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
storage/maria/CMakeLists.txt
View file

@ -104,33 +104,6 @@ OPTION(USE_ARIA_FOR_TMP_TABLES "Use Aria for temporary tables" ON)
# S3
#
INCLUDE (CheckIncludeFiles)
INCLUDE (CheckCSourceRuns)
SET(CURL_SSL_TEST_SOURCE "\n
#include <curl/curl.h>\n
#include <stdlib.h>\n
#include <string.h>\n
int main(void)\n
{\n
curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);\n
\n
if (data->ssl_version)\n
{\n
if (strncmp(data->ssl_version, \"OpenSSL\", 7) != 0)\n
{\n
return EXIT_SUCCESS;\n
}\n
if (data->ssl_version[8] == '0')\n
{\n
return EXIT_FAILURE;\n
}\n
if ((data->ssl_version[8] == '1') && (data->ssl_version[10] == '0'))\n
{\n
return EXIT_FAILURE;\n
}\n
}\n
return EXIT_SUCCESS;\n
}")
SET(S3_SOURCES ha_s3.cc s3_func.c
libmarias3/src/debug.c libmarias3/src/error.c libmarias3/src/marias3.c
@ -148,21 +121,12 @@ IF (CURL_FOUND)
ENDIF()
IF(TARGET s3)
SET(CMAKE_REQUIRED_LIBRARIES curl)
CHECK_C_SOURCE_RUNS("${CURL_SSL_TEST_SOURCE}" FOUND_SAFE_CURL_SSL)
UNSET(CMAKE_REQUIRED_LIBRARIES)
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)
ADD_DEFINITIONS(-DWITH_S3_STORAGE_ENGINE)
IF (FOUND_SAFE_CURL_SSL)
MESSAGE(STATUS "Found thread safe curl ssl")
ELSE ()
MESSAGE(STATUS "Found thread unsafe curl ssl, locks added")
ADD_DEFINITIONS(-DHAVE_CURL_OPENSSL_UNSAFE)
ENDIF ()
TARGET_LINK_LIBRARIES(aria s3)
ENDIF()

2
storage/maria/libmarias3

@ -1 +1 @@
Subproject commit 8727cf74fd9fe641ee1b200486036f311e2bd09b
Subproject commit d172e86c16224b4e0229ca6f102e662a2315aeff