bk commit into 5.1 tree (msvensson:1.2284)

[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.2284 06/04/07 11:26:21 msvensson@neptunus.(none) +3 -0
  Add new function mysql_get_ssl_cipher to libmysl and use it from client to avoid dependency on SSL libs from mysql client.

  sql-common/client.c
    1.90 06/04/07 11:26:17 msvensson@neptunus.(none) +21 -0
    Add new function mysql_get_ssl_cipher, will return the cipher used for the current connection to the server. 

  include/mysql.h
    1.159 06/04/07 11:26:17 msvensson@neptunus.(none) +1 -0
    Add new function mysql_get_ssl_cipher

  client/mysql.cc
    1.199 06/04/07 11:26:17 msvensson@neptunus.(none) +2 -3
    Add new function mysql_get_ssl_cipher to libmysl and use it from client to avoid dependency on SSL libs from mysql client.

# 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.198/client/mysql.cc	2006-03-28 03:45:01 +02:00
+++ 1.199/client/mysql.cc	2006-04-07 11:26:17 +02:00
@@ -3212,10 +3212,9 @@
       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 (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));
+		  mysql_get_ssl_cipher(&mysql));
     else
 #endif /* HAVE_OPENSSL */
       tee_puts("SSL:\t\t\tNot in use", stdout);

--- 1.158/include/mysql.h	2006-03-28 06:26:48 +02:00
+++ 1.159/include/mysql.h	2006-04-07 11:26:17 +02:00
@@ -409,6 +409,7 @@
 my_bool		STDCALL mysql_ssl_set(MYSQL *mysql, const char *key,
 				      const char *cert, const char *ca,
 				      const char *capath, const char *cipher);
+const char *    STDCALL mysql_get_ssl_cipher(MYSQL *mysql);
 my_bool		STDCALL mysql_change_user(MYSQL *mysql, const char *user, 
 					  const char *passwd, const char *db);
 MYSQL *		STDCALL mysql_real_connect(MYSQL *mysql, const char *host,

--- 1.89/sql-common/client.c	2006-03-28 06:26:48 +02:00
+++ 1.90/sql-common/client.c	2006-04-07 11:26:17 +02:00
@@ -1535,6 +1535,27 @@
   mysql->connector_fd = 0;
   DBUG_VOID_RETURN;
 }
+
+
+/*
+  Return the SSL cipher (if any) used for current
+  connection to the server.
+
+  SYNOPSYS
+    mysql_get_ssl_cipher()
+      mysql pointer to the mysql connection
+
+*/
+
+const char * STDCALL
+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(NULL);
+}
+
 #endif /* HAVE_OPENSSL */