diff options
| author | unknown <tonu@x153.internalnet> | 2001-07-24 15:00:36 +0800 |
|---|---|---|
| committer | unknown <tonu@x153.internalnet> | 2001-07-24 15:00:36 +0800 |
| commit | 55fbccfd81b61934c75082006b8c53c01a666359 (patch) | |
| tree | c83d351c310d448d629eb358d6f4f5c22f640651 /include | |
| parent | cab947d58a123384489541dfd3b681ca15c298a2 (diff) | |
| parent | 2ec8dce13dc2357179244e73e97648034b7cc5a6 (diff) | |
| download | mariadb-git-55fbccfd81b61934c75082006b8c53c01a666359.tar.gz | |
Merge work.mysql.com:/home/bk/mysql-4.0
into x153.internalnet:/home/tonu/mysql-x
BitKeeper/etc/logging_ok:
auto-union
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
libmysql/libmysql.c:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 6 | ||||
| -rw-r--r-- | include/violite.h | 16 |
2 files changed, 13 insertions, 9 deletions
diff --git a/include/global.h b/include/global.h index f41ac3ed184..c7a3498b76a 100644 --- a/include/global.h +++ b/include/global.h @@ -189,7 +189,13 @@ # endif #endif /* TIME_WITH_SYS_TIME */ #ifdef HAVE_UNISTD_H +#ifdef HAVE_OPENSSL +#define crypt dummy +#endif #include <unistd.h> +#ifdef HAVE_OPENSSL +#undef crypt +#endif #endif #if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA) #undef HAVE_ALLOCA diff --git a/include/violite.h b/include/violite.h index bc10a8f527c..49791c6b68a 100644 --- a/include/violite.h +++ b/include/violite.h @@ -137,11 +137,9 @@ my_bool vio_poll_read(Vio *vio,uint timeout); #ifdef HAVE_OPENSSL -#include <openssl/x509.h> +#define HEADER_DES_LOCL_H dummy_something #include <openssl/ssl.h> #include <openssl/err.h> -#include <openssl/pem.h> -#include <openssl/asn1.h> #include "my_net.h" /* needed because of struct in_addr */ @@ -184,10 +182,9 @@ struct st_VioSSLAcceptorFd state_connect = 1, state_accept = 2 }; - BIO* bio_; - char *ssl_cip_; - char desc_[100]; - Vio* sd_; +// BIO* bio_; +// char desc_[100]; +// Vio* sd_; /* function pointers which are only once for SSL server Vio*(*sslaccept)(struct st_VioSSLAcceptorFd*,Vio*); */ @@ -200,8 +197,8 @@ struct st_VioSSLConnectorFd SSL_METHOD* ssl_method_; /* function pointers which are only once for SSL client */ }; -Vio *sslaccept(struct st_VioSSLAcceptorFd*, Vio*); -Vio *sslconnect(struct st_VioSSLConnectorFd*, Vio*); +void sslaccept(struct st_VioSSLAcceptorFd*, Vio*); +void sslconnect(struct st_VioSSLConnectorFd*, Vio*); #else /* HAVE_OPENSSL */ /* This dummy is required to maintain proper size of st_mysql in mysql.h */ @@ -250,6 +247,7 @@ struct st_vio BIO* bio_; SSL* ssl_; my_bool open_; + char *ssl_cip_; #endif /* HAVE_OPENSSL */ #endif /* HAVE_VIO */ }; |