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

Merge branch '3.2' into 3.3

Browse Source
This commit is contained in:
Georg Richter
2021-12-22 07:18:27 +01:00
parent 7c29edf8a4 fd68d46868
commit 0489f34b48
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -72,7 +72,7 @@ INCLUDE(FindCURL)
IF(WITH_SIGNCODE) IF(WITH_SIGNCODE)
IF(WIN32 AND NOT SIGN_OPTIONS) IF(WIN32 AND NOT SIGN_OPTIONS)
SET(SIGN_OPTIONS /a /t http://timestamp.verisign.com/scripts/timstamp.dll) SET(SIGN_OPTIONS /tr http://timestamp.digicert.com /td sha256 /fd sha256 /a)
ELSE() ELSE()
SEPARATE_ARGUMENTS(SIGN_OPTIONS) SEPARATE_ARGUMENTS(SIGN_OPTIONS)
ENDIF() ENDIF()

8
libmariadb/mariadb_rpl.c
View File

@@ -455,8 +455,8 @@ void STDCALL mariadb_rpl_close(MARIADB_RPL *rpl)
} }
int mariadb_rpl_optionsv(MARIADB_RPL *rpl, int mariadb_rpl_optionsv(MARIADB_RPL *rpl,
enum mariadb_rpl_option option, enum mariadb_rpl_option option,
...) ...)
{ {
va_list ap; va_list ap;
int rc= 0; int rc= 0;
@@ -510,8 +510,8 @@ end:
} }
int mariadb_rpl_get_optionsv(MARIADB_RPL *rpl, int mariadb_rpl_get_optionsv(MARIADB_RPL *rpl,
enum mariadb_rpl_option option, enum mariadb_rpl_option option,
...) ...)
{ {
va_list ap; va_list ap;