mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Merge bk-internal:/home/bk/mysql-5.1-new
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
This commit is contained in:
@@ -1535,6 +1535,27 @@ mysql_ssl_free(MYSQL *mysql __attribute__((unused)))
|
||||
mysql->connector_fd = 0;
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
Return the SSL cipher (if any) used for current
|
||||
connection to the server.
|
||||
|
||||
SYNOPSYS
|
||||
mysql_get_ssl_cipher()
|
||||
mysql pointer to the mysql connection
|
||||
|
||||
*/
|
||||
|
||||
const char * STDCALL
|
||||
mysql_get_ssl_cipher(MYSQL *mysql)
|
||||
{
|
||||
DBUG_ENTER("mysql_get_ssl_cipher");
|
||||
if (mysql->net.vio && mysql->net.vio->ssl_arg)
|
||||
SSL_get_cipher_name((SSL*)mysql->net.vio->ssl_arg);
|
||||
DBUG_RETURN(NULL);
|
||||
}
|
||||
|
||||
#endif /* HAVE_OPENSSL */
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user