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 branch '10.4' into 10.5

Browse Source
This commit is contained in:
Sergei Golubchik
2020-05-09 20:43:36 +02:00
parent 72c7b4eb4c f5844e7c4b
commit 13038e4705
100 changed files with 1571 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/violite.h
View File

@@ -149,9 +149,9 @@ int vio_getnameinfo(const struct sockaddr *sa,
/* Set yaSSL to use same type as MySQL do for socket handles */
typedef my_socket YASSL_SOCKET_T;
#define YASSL_SOCKET_T_DEFINED
#define Timeval WOLFSSL_Timeval
#define template _template /* bug in WolfSSL 4.4.0, see also my_crypt.cc */
#include <openssl/ssl.h>
#undef Timeval
#undef template
#include <openssl/err.h>
#ifdef DEPRECATED
#undef DEPRECATED