You've already forked mariadb-connector-c
mirror of
https://github.com/mariadb-corporation/mariadb-connector-c.git
synced 2025-08-07 02:42:49 +03:00
Merge branch '3.2' into 3.3
This commit is contained in:
@@ -72,7 +72,7 @@ INCLUDE(FindCURL)
|
||||
|
||||
IF(WITH_SIGNCODE)
|
||||
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()
|
||||
SEPARATE_ARGUMENTS(SIGN_OPTIONS)
|
||||
ENDIF()
|
||||
|
@@ -455,8 +455,8 @@ void STDCALL mariadb_rpl_close(MARIADB_RPL *rpl)
|
||||
}
|
||||
|
||||
int mariadb_rpl_optionsv(MARIADB_RPL *rpl,
|
||||
enum mariadb_rpl_option option,
|
||||
...)
|
||||
enum mariadb_rpl_option option,
|
||||
...)
|
||||
{
|
||||
va_list ap;
|
||||
int rc= 0;
|
||||
@@ -510,8 +510,8 @@ end:
|
||||
}
|
||||
|
||||
int mariadb_rpl_get_optionsv(MARIADB_RPL *rpl,
|
||||
enum mariadb_rpl_option option,
|
||||
...)
|
||||
enum mariadb_rpl_option option,
|
||||
...)
|
||||
{
|
||||
va_list ap;
|
||||
|
||||
|
Reference in New Issue
Block a user