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.1' into 3.2

Browse Source
This commit is contained in:
Georg Richter
2022-05-02 10:57:27 +02:00
parent 3ba4c4a613 ab7a81e79e
commit ade9bb9c3e
3 changed files with 52 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libmariadb/mariadb_lib.c
View File

@@ -680,6 +680,18 @@ struct st_default_options mariadb_defaults[] =
(OPTS)->extension= (struct st_mysql_options_extension *) \
calloc(1, sizeof(struct st_mysql_options_extension));
#define OPT_SET_EXTENDED_VALUE_BIN(OPTS, KEY, KEY_LEN, VAL, LEN) \
CHECK_OPT_EXTENSION_SET(OPTS) \
free((gptr)(OPTS)->extension->KEY); \
if((VAL) && (LEN)) { \
if (((OPTS)->extension->KEY= malloc((LEN)))) { \
memcpy((OPTS)->extension->KEY, (VAL), (LEN)); \
(OPTS)->extension->KEY_LEN= (LEN); \
} \
} \
else \
(OPTS)->extension->KEY= NULL
#define OPT_SET_EXTENDED_VALUE_STR(OPTS, KEY, VAL) \
CHECK_OPT_EXTENSION_SET(OPTS) \
free((gptr)(OPTS)->extension->KEY); \
@@ -3360,8 +3372,7 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...)
case MARIADB_OPT_PROXY_HEADER:
{
size_t arg2 = va_arg(ap, size_t);
OPT_SET_EXTENDED_VALUE(&mysql->options, proxy_header, (char *)arg1);
OPT_SET_EXTENDED_VALUE(&mysql->options, proxy_header_len, arg2);
OPT_SET_EXTENDED_VALUE_BIN(&mysql->options, proxy_header, proxy_header_len, (char *)arg1, arg2);
}
break;
case MARIADB_OPT_TLS_VERSION: