diff options
Diffstat (limited to 'libmariadb/include/ma_common.h')
| -rw-r--r-- | libmariadb/include/ma_common.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/libmariadb/include/ma_common.h b/libmariadb/include/ma_common.h index 1ac0cb68..dfa96621 100644 --- a/libmariadb/include/ma_common.h +++ b/libmariadb/include/ma_common.h @@ -73,6 +73,7 @@ struct st_mysql_options_extension { unsigned int tls_cipher_strength; char *tls_version; my_bool read_only; + my_bool bulk_unit_results; char *connection_handler; my_bool (*set_option)(MYSQL *mysql, const char *config_option, const char *config_value); MA_HASHTBL userdata; @@ -86,7 +87,7 @@ struct st_mysql_options_extension { unsigned short rpl_port; void (*status_callback)(void *ptr, enum enum_mariadb_status_info type, ...); void *status_data; - my_bool tls_verify_server_cert; + my_bool tls_allow_invalid_server_cert; }; typedef struct st_connection_handler @@ -129,3 +130,16 @@ typedef struct st_mariadb_field_extension { MARIADB_CONST_STRING metadata[MARIADB_FIELD_ATTR_LAST+1]; /* 10.5 */ } MA_FIELD_EXTENSION; + +#if defined(HAVE_SCHANNEL) || defined(HAVE_GNUTLS) +#define reset_tls_self_signed_error(mysql) \ + do { \ + free((char*)mysql->net.tls_self_signed_error); \ + mysql->net.tls_self_signed_error= 0; \ + } while(0) +#else +#define reset_tls_self_signed_error(mysql) \ + do { \ + mysql->net.tls_self_signed_error= 0; \ + } while(0) +#endif |