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 | fc81492a0a86ce9792617596f70f9b70b00ba0f6 (patch) | |
| tree | dca7aaa21e51f58a292650fe93a49debb052746b /include | |
| parent | db1e32e35d2ddf16d14b4d9bf7e4a85e07370ed9 (diff) | |
| parent | 81c20c055f64e57207af830c6416491093b762b5 (diff) | |
| download | mariadb-git-fc81492a0a86ce9792617596f70f9b70b00ba0f6.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')
| -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> |