database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fix MWL#192 build error: Remove SSL special case for embedded server.

Browse Source 
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.
This commit is contained in:
unknown
2012-02-22 11:44:53 +01:00
parent f6b68a1070
commit f2db5ef4ba
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql-common/client.c
View File

@@ -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 */
/*