diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-28 15:57:27 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-28 15:57:27 +0200 |
| commit | 70ae657cc20b2901a28e58521b427570865a30c2 (patch) | |
| tree | dca7aaa21e51f58a292650fe93a49debb052746b /include/violite.h | |
| parent | f86a489f76ffd5dcbbf3b8a66c55e48c7e68ae95 (diff) | |
| parent | 1778d177be6363c88c58cb8eafaa0f530a97d593 (diff) | |
| download | mariadb-git-70ae657cc20b2901a28e58521b427570865a30c2.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
extra/yassl/include/openssl/ssl.h:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
include/violite.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'include/violite.h')
| -rw-r--r-- | include/violite.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/violite.h b/include/violite.h index 2647342ed65..04365213ec0 100644 --- a/include/violite.h +++ b/include/violite.h @@ -102,6 +102,9 @@ void vio_timeout(Vio *vio,uint which, uint timeout); #define HEADER_DES_LOCL_H dummy_something #define YASSL_MYSQL_COMPATIBLE #define YASSL_PREFIX +/* Set yaSSL to use same type as MySQL do for socket handles */ +typedef my_socket YASSL_SOCKET_T; +#define YASSL_SOCKET_T_DEFINED #include <openssl/ssl.h> #include <openssl/err.h> |