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

- Changed return code for mysql_optionv/mysql_get_optionv to 1 (was -1) and added CR_NOT_IMPLEMENTED error message.

Browse Source 
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!
This commit is contained in:
Georg Richter
2019-02-03 16:28:38 +01:00
parent 4964fae885
commit cb08739aa2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libmariadb/mariadb_lib.c
View File

@@ -3015,7 +3015,8 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...)
break; break;
default: default:
va_end(ap); va_end(ap);
return(-1); SET_CLIENT_ERROR(mysql, CR_NOT_IMPLEMENTED, SQLSTATE_UNKNOWN, 0);
return(1);
} }
va_end(ap); va_end(ap);
return(0); return(0);
@@ -3229,13 +3230,14 @@ mysql_get_optionv(MYSQL *mysql, enum mysql_option option, void *arg, ...)
break; break;
default: default:
va_end(ap); va_end(ap);
return(-1); SET_CLIENT_ERROR(mysql, CR_NOT_IMPLEMENTED, SQLSTATE_UNKNOWN, 0);
return(1);
} }
va_end(ap); va_end(ap);
return(0); return(0);
error: error:
va_end(ap); va_end(ap);
return(-1); return(1);
} }
int STDCALL mysql_get_option(MYSQL *mysql, enum mysql_option option, void *arg) int STDCALL mysql_get_option(MYSQL *mysql, enum mysql_option option, void *arg)