diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-04-22 00:48:13 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-04-22 00:48:13 +0200 |
| commit | 98a2008fd247c996c0c53cb69ac92ddc1118b109 (patch) | |
| tree | 2eb5e609d509b73d85a94e2edde0ca1a50800db2 /client | |
| parent | a66fc918e954b00f3f9981e8b260ce50aeccf230 (diff) | |
| download | mariadb-git-98a2008fd247c996c0c53cb69ac92ddc1118b109.tar.gz | |
Backport fix for mysql client not using SSl library directly
- Add function mysql_get_ssl_cipher
- Use function mysql_get_ssl_cipher from mysql
client/mysql.cc:
Backport fix for mysql client not using SSl library directly
include/mysql.h:
Backport fix for mysql client not using SSl library directly
libmysql/libmysql.def:
Backport fix for mysql client not using SSl library directly
libmysqld/libmysqld.def:
Backport fix for mysql client not using SSl library directly
sql-common/client.c:
Backport fix for mysql client not using SSl library directly
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 8589bdb05ed..5b53570bf34 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3235,10 +3235,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); |