From cb08739aa203b7afdbbca8393ed98e363b54adf0 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Sun, 3 Feb 2019 16:28:38 +0100 Subject: [PATCH] - Changed return code for mysql_optionv/mysql_get_optionv to 1 (was -1) and added CR_NOT_IMPLEMENTED error message. if a options is unknown or not supported. This will fix possible error when setting connection attributes. Kudos to Coray Hickey for providing this patch! --- libmariadb/mariadb_lib.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c index 69068ed6..3a5db2d6 100644 --- a/libmariadb/mariadb_lib.c +++ b/libmariadb/mariadb_lib.c @@ -3015,7 +3015,8 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...) break; default: va_end(ap); - return(-1); + SET_CLIENT_ERROR(mysql, CR_NOT_IMPLEMENTED, SQLSTATE_UNKNOWN, 0); + return(1); } va_end(ap); return(0); @@ -3229,13 +3230,14 @@ mysql_get_optionv(MYSQL *mysql, enum mysql_option option, void *arg, ...) break; default: va_end(ap); - return(-1); + SET_CLIENT_ERROR(mysql, CR_NOT_IMPLEMENTED, SQLSTATE_UNKNOWN, 0); + return(1); } va_end(ap); return(0); error: va_end(ap); - return(-1); + return(1); } int STDCALL mysql_get_option(MYSQL *mysql, enum mysql_option option, void *arg)