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

Merge remote-tracking branch 'origin/3.3' into 3.4-tls

Browse Source
This commit is contained in:
Georg Richter
2024-06-25 11:57:27 +02:00
parent 7498d30a07 486ce75d64
commit 5386f1a3f2
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -310,8 +310,8 @@ IF(NOT WITH_SSL STREQUAL "OFF")
SET(SSL_SOURCES "${CC_SOURCE_DIR}/libmariadb/secure/openssl.c" SET(SSL_SOURCES "${CC_SOURCE_DIR}/libmariadb/secure/openssl.c"
"${CC_SOURCE_DIR}/libmariadb/secure/openssl_crypt.c") "${CC_SOURCE_DIR}/libmariadb/secure/openssl_crypt.c")
SET(SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY}) SET(SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
IF(WIN32) IF(WIN32 AND EXISTS ${OPENSSL_INCLUDE_DIR}/openssl/applink.c)
CHECK_INCLUDE_FILES (${OPENSSL_INCLUDE_DIR}/openssl/applink.c HAVE_OPENSSL_APPLINK_C) SET(HAVE_OPENSSL_APPLINK_C 1)
ENDIF() ENDIF()
INCLUDE_DIRECTORIES(BEFORE ${OPENSSL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(BEFORE ${OPENSSL_INCLUDE_DIR})

7
libmariadb/mariadb_lib.c
View File

@@ -821,7 +821,10 @@ my_bool _mariadb_set_conf_option(MYSQL *mysql, const char *config_option, const
option_val= &val_sizet; option_val= &val_sizet;
break; break;
case MARIADB_OPTION_STR: case MARIADB_OPTION_STR:
option_val= (void*)config_value; if (config_value && !config_value[0])
option_val= NULL;
else
option_val= (void*)config_value;
break; break;
case MARIADB_OPTION_NONE: case MARIADB_OPTION_NONE:
break; break;
@@ -917,7 +920,7 @@ static int parse_connection_string(MYSQL *mysql, const char *unused __attribute_
if (!key) if (!key)
goto error; goto error;
*pos++= 0; *pos++= 0;
if (pos < end) if (pos <= end)
val= pos; val= pos;
continue; continue;
break; break;