diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-02 10:50:39 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-02 10:50:39 +0200 |
| commit | 3378a48698a311403651fe9bb83d1dfe80a98d78 (patch) | |
| tree | da9c4b945967d94e3b16c2fd56a52699aba69b66 /include | |
| parent | f249185b6eead7796f15f880a896a7782222db99 (diff) | |
| parent | 44d4940fcc001a6606c63e8900d9e2bf41ea4e67 (diff) | |
| download | mariadb-git-3378a48698a311403651fe9bb83d1dfe80a98d78.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/gis.result:
SCCS merged
mysql-test/t/gis.test:
SCCS 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 4122e581a0f..63388c170c9 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> |