database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

removed mysql_get_parameters from export list

Browse Source 
disable creation of certificates if SSL is disabled or OpenSSL is not
available
This commit is contained in:
Georg Richter
2016-01-28 16:53:26 +01:00
parent 29163e8374
commit 2cc57282f6
3 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -223,7 +223,6 @@ IF(NOT WITH_SSL STREQUAL "OFF")
ENDIF() ENDIF()
IF(WIN32) IF(WIN32)
IF(WITH_SSL STREQUAL "SCHANNEL") IF(WITH_SSL STREQUAL "SCHANNEL")
MESSAGE(STATUS "SSL_TYPE ${SSL_TYPE}")
ADD_DEFINITIONS(-DHAVE_SCHANNEL -DHAVE_SSL) ADD_DEFINITIONS(-DHAVE_SCHANNEL -DHAVE_SSL)
SET(SSL_SOURCES "${CMAKE_SOURCE_DIR}/libmariadb/secure/schannel.c" "${CMAKE_SOURCE_DIR}/libmariadb/secure/ma_schannel.c") SET(SSL_SOURCES "${CMAKE_SOURCE_DIR}/libmariadb/secure/schannel.c" "${CMAKE_SOURCE_DIR}/libmariadb/secure/ma_schannel.c")
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/plugins/pvio/") INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/plugins/pvio/")

1
libmariadb/CMakeLists.txt
View File

@@ -84,7 +84,6 @@ SET(EXPORT_SYMBOLS
mysql_get_host_info mysql_get_host_info
mysql_get_option mysql_get_option
mysql_get_optionv mysql_get_optionv
mysql_get_parameters
mysql_get_proto_info mysql_get_proto_info
mysql_get_server_info mysql_get_server_info
mysql_get_server_name mysql_get_server_name

2
unittest/libmariadb/CMakeLists.txt
View File

@@ -27,7 +27,7 @@ SET(API_TESTS "async" "basic-t" "fetch" "charset" "logs" "cursor" "errors" "view
#exclude following tests from ctests, since we need to run them maually with different credentials #exclude following tests from ctests, since we need to run them maually with different credentials
SET(MANUAL_TESTS "t_aurora") SET(MANUAL_TESTS "t_aurora")
# Get finger print from server certificate # Get finger print from server certificate
IF(WITH_SSL) IF(WITH_SSL AND OPENSSL_FOUND)
#create certificates #create certificates
IF(EXISTS "${CMAKE_SOURCE_DIR}/unittest/libmariadb/certs/server-cert.pem") IF(EXISTS "${CMAKE_SOURCE_DIR}/unittest/libmariadb/certs/server-cert.pem")