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.0' of https://github.com/MariaDB/mariadb-connector-c into 3.0

Browse Source
This commit is contained in:
Georg Richter
2019-02-05 13:58:07 +01:00
parent 5783a8b59a 02bf9033ef
commit 438b7f452a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libmariadb/mariadb_lib.c
View File

@@ -2784,7 +2784,10 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...)
net_buffer_length= (unsigned long)(*(size_t *)arg1); net_buffer_length= (unsigned long)(*(size_t *)arg1);
break; break;
case MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS: case MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS:
*((my_bool *)arg1)= test(mysql->options.client_flag & CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS); if (*(my_bool *)arg1)
mysql->options.client_flag |= CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS;
else
mysql->options.client_flag &= ~CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS;
break; break;
case MYSQL_OPT_SSL_ENFORCE: case MYSQL_OPT_SSL_ENFORCE:
mysql->options.use_ssl= (*(my_bool *)arg1); mysql->options.use_ssl= (*(my_bool *)arg1);
@@ -3120,10 +3123,7 @@ mysql_get_optionv(MYSQL *mysql, enum mysql_option option, void *arg, ...)
*((my_bool *)arg)= test(mysql->options.extension && mysql->options.extension->async_context); *((my_bool *)arg)= test(mysql->options.extension && mysql->options.extension->async_context);
break; break;
case MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS: case MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS:
if (*(my_bool *)arg) *((my_bool *)arg)= test(mysql->options.client_flag & CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS);
mysql->options.client_flag |= CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS;
else
mysql->options.client_flag &= ~CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS;
break; break;
case MYSQL_OPT_SSL_ENFORCE: case MYSQL_OPT_SSL_ENFORCE:
*((my_bool *)arg)= mysql->options.use_ssl; *((my_bool *)arg)= mysql->options.use_ssl;