diff options
| author | msvensson@shellback.(none) <> | 2006-04-27 17:35:29 +0200 |
|---|---|---|
| committer | msvensson@shellback.(none) <> | 2006-04-27 17:35:29 +0200 |
| commit | e5004d13126c617be159bc29b7bb7fd41c466659 (patch) | |
| tree | 351430ff19617a6fb1bf20f82fc7bbb668d4c6ba /client | |
| parent | 46ee4ea0dffdeb4121fc34de3f930fb29276866b (diff) | |
| parent | 0e5113aead49dd97f20c062c817f7ef2ffee9693 (diff) | |
| download | mariadb-git-e5004d13126c617be159bc29b7bb7fd41c466659.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
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 12c86e02dc4..69a0e37b982 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -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); |