database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-05-05 21:16:22 +03:00
parent 36b8ac2c0d 2c3c851d2c
commit 7bcaa541aa
140 changed files with 1689 additions and 954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/violite.h
View File

@@ -153,6 +153,9 @@ typedef my_socket YASSL_SOCKET_T;
#include <openssl/ssl.h>
#undef Timeval
#include <openssl/err.h>
#ifdef DEPRECATED
#undef DEPRECATED
#endif
enum enum_ssl_init_error
{