diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-02-22 11:44:53 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-02-22 11:44:53 +0100 |
| commit | f2db5ef4ba128c86d02e6571f9aba907b8ea64c3 (patch) | |
| tree | 58515888a2469620468b07f885386f954dfe93b5 | |
| parent | f6b68a10707c95e24f67d338eaaa03f1bd575598 (diff) | |
| download | mariadb-git-f2db5ef4ba128c86d02e6571f9aba907b8ea64c3.tar.gz | |
Fix MWL#192 build error: Remove SSL special case for embedded server.
VIO has SSL in embedded server anyway, so we do not win anything by excluding it.
This was actually already done in this changeset:
revision-id: kostja@sun.com-20100413150445-8x23keoxdiufgq76
"... Also, he removed the (probable) bug of embedded server never using SSL-dependent functions..."
But was apparenly lost by a mis-merge of WL#5030.
| -rw-r--r-- | include/my_global.h | 1 | ||||
| -rw-r--r-- | include/violite.h | 2 | ||||
| -rw-r--r-- | sql-common/client.c | 4 |
3 files changed, 2 insertions, 5 deletions
diff --git a/include/my_global.h b/include/my_global.h index 26cba5b4ed7..22b4f822ab9 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1532,7 +1532,6 @@ static inline double rint(double x) /* Things we don't need in the embedded version of MySQL */ /* TODO HF add #undef HAVE_VIO if we don't want client in embedded library */ -#undef HAVE_OPENSSL #undef HAVE_SMEM /* No shared memory */ #endif /* EMBEDDED_LIBRARY */ diff --git a/include/violite.h b/include/violite.h index f177bcd4f82..19c9d8bfe54 100644 --- a/include/violite.h +++ b/include/violite.h @@ -120,7 +120,6 @@ typedef my_socket YASSL_SOCKET_T; #include <openssl/ssl.h> #include <openssl/err.h> -#ifndef EMBEDDED_LIBRARY enum enum_ssl_init_error { SSL_INITERR_NOERROR= 0, SSL_INITERR_CERT, SSL_INITERR_KEY, @@ -146,7 +145,6 @@ struct st_VioSSLFd const char *ca_file,const char *ca_path, const char *cipher, enum enum_ssl_init_error* error); void free_vio_ssl_acceptor_fd(struct st_VioSSLFd *fd); -#endif /* ! EMBEDDED_LIBRARY */ #endif /* HAVE_OPENSSL */ void vio_end(void); diff --git a/sql-common/client.c b/sql-common/client.c index 2904ffa7b64..f79d7de0c73 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1864,7 +1864,7 @@ mysql_get_ssl_cipher(MYSQL *mysql __attribute__((unused))) */ -#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) +#if defined(HAVE_OPENSSL) static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const char **errptr) { @@ -1922,7 +1922,7 @@ static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const c DBUG_RETURN(1); } -#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */ +#endif /* HAVE_OPENSSL */ /* |