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

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0

Browse Source 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
msvensson@shellback.(none)
2006-04-27 17:35:29 +02:00
parent 46ee4ea0df 0e5113aead
commit e5004d1312
146 changed files with 10986 additions and 1471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/mysql.cc
View File

@@ -3228,10 +3228,9 @@ com_status(String *buffer __attribute__((unused)),
mysql_free_result(result);
}
#ifdef HAVE_OPENSSL
if (mysql.net.vio && mysql.net.vio->ssl_arg &&
SSL_get_cipher((SSL*) mysql.net.vio->ssl_arg))
if ((status= mysql_get_ssl_cipher(&mysql)))
tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n",
SSL_get_cipher((SSL*) mysql.net.vio->ssl_arg));
status);
else
#endif /* HAVE_OPENSSL */
tee_puts("SSL:\t\t\tNot in use", stdout);