bk commit into 5.1 tree (msvensson:1.2303)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2303 06/04/10 12:23:20 msvensson@neptunus.(none) +3 -0
  Update implementation of new function 'mysql_get_ssl_cipher' after review

  sql-common/client.c
    1.93 06/04/10 12:23:16 msvensson@neptunus.(none) +1 -1
    Add missing return(DBUG_RETURN)

  libmysql/libmysql.def
    1.44 06/04/10 12:23:16 msvensson@neptunus.(none) +1 -0
    Add new function mysql_get_ssl_cipher to exported functions in dll

  client/mysql.cc
    1.200 06/04/10 12:23:16 msvensson@neptunus.(none) +2 -2
    Only call mysql_get_ssl_cipher once, save the result in variable "status"

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1

--- 1.199/client/mysql.cc	2006-04-07 11:26:17 +02:00
+++ 1.200/client/mysql.cc	2006-04-10 12:23:16 +02:00
@@ -3212,9 +3212,9 @@
       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);

--- 1.92/sql-common/client.c	2006-04-07 11:36:21 +02:00
+++ 1.93/sql-common/client.c	2006-04-10 12:23:16 +02:00
@@ -1552,7 +1552,7 @@
 {
   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);
 }
 

--- 1.43/libmysql/libmysql.def	2005-07-29 15:40:27 +02:00
+++ 1.44/libmysql/libmysql.def	2006-04-10 12:23:16 +02:00
@@ -65,6 +65,7 @@
 	mysql_get_proto_info
 	mysql_get_server_info
 	mysql_get_client_version
+	mysql_get_ssl_cipher
 	mysql_info
 	mysql_init
 	mysql_insert_id