database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge with 4.0

Browse Source
This commit is contained in:
monty@mashka.mysql.fi
2002-11-21 15:56:48 +02:00
parent 305d16a7cb e60050c4dd
commit dac6498f9b
300 changed files with 7665 additions and 2426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/violite.h
View File

@ -188,7 +188,7 @@ struct st_VioSSLConnectorFd
SSL_METHOD* ssl_method_;
};
void sslaccept(struct st_VioSSLAcceptorFd*, Vio*, long timeout);
int sslaccept(struct st_VioSSLAcceptorFd*, Vio*, long timeout);
int sslconnect(struct st_VioSSLConnectorFd*, Vio*, long timeout);
struct st_VioSSLConnectorFd
@ -245,7 +245,6 @@ struct st_vio
#ifdef HAVE_OPENSSL
SSL* ssl_;
my_bool open_;
#endif /* HAVE_OPENSSL */
#ifdef HAVE_SMEM
HANDLE handle_file_map;