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 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

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;
break;
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;
case MARIADB_OPTION_NONE:
break;
@@ -917,7 +920,7 @@ static int parse_connection_string(MYSQL *mysql, const char *unused __attribute_
if (!key)
goto error;
*pos++= 0;
if (pos < end)
if (pos <= end)
val= pos;
continue;
break;