diff options
| -rw-r--r-- | client/mysql.cc | 4 | ||||
| -rw-r--r-- | libmysql/libmysql.def | 1 | ||||
| -rw-r--r-- | sql-common/client.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index a0bc6f52f29..077ea69c3ca 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3212,9 +3212,9 @@ com_status(String *buffer __attribute__((unused)), mysql_free_result(result); } #ifdef HAVE_OPENSSL - if (mysql_get_ssl_cipher(&mysql)) + if ((status= mysql_get_ssl_cipher(&mysql))) tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n", - mysql_get_ssl_cipher(&mysql)); + status); else #endif /* HAVE_OPENSSL */ tee_puts("SSL:\t\t\tNot in use", stdout); diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index a469c67c466..cf45e20a697 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -65,6 +65,7 @@ EXPORTS mysql_get_proto_info mysql_get_server_info mysql_get_client_version + mysql_get_ssl_cipher mysql_info mysql_init mysql_insert_id diff --git a/sql-common/client.c b/sql-common/client.c index 1303b26c325..72745d72b12 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1552,7 +1552,7 @@ 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(SSL_get_cipher_name((SSL*)mysql->net.vio->ssl_arg)); DBUG_RETURN(NULL); } |