summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.blaudden>2007-03-29 13:37:32 +0200
committerunknown <msvensson@pilot.blaudden>2007-03-29 13:37:32 +0200
commit8add0bcccaa2acacceab0d1fd901c65284fb754e (patch)
tree2705fedf142751ee743c55f2d2a3ba954e70d996 /include
parent3556deebd5e26ad5b48bdc52ac97af2e306c2bac (diff)
parent8d77dcbbc493bf02efdc99b9d26609f8a0ef3a0d (diff)
downloadmariadb-git-8add0bcccaa2acacceab0d1fd901c65284fb754e.tar.gz
Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my51-bug24121
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
Diffstat (limited to 'include')
-rw-r--r--include/violite.h3
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>