From c4c9d4fb8cc4c5114728a150d6a075834f2a050d Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Mon, 10 Apr 2006 12:23:20 +0200
Subject: [PATCH] Update implementation of new function 'mysql_get_ssl_cipher'
 after review

client/mysql.cc:
  Only call mysql_get_ssl_cipher once, save the result in variable "status"
libmysql/libmysql.def:
  Add new function mysql_get_ssl_cipher to exported functions in dll
sql-common/client.c:
  Add missing return(DBUG_RETURN)
---
 client/mysql.cc       | 4 ++--
 libmysql/libmysql.def | 1 +
 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);
 }