List:Commits« Previous MessageNext Message »
From:msvensson Date:November 16 2007 9:44am
Subject:bk commit into 5.0 tree (msvensson:1.2524) BUG#32429
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 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@stripped, 2007-11-16 10:43:59+01:00, msvensson@stripped +1 -0
  Bug#32429 ssl_cipher setting in my.cnf not read by libmysqlclient

  sql-common/client.c@stripped, 2007-11-16 10:43:58+01:00, msvensson@stripped +5 -0
    Store ssl_cipher setting read from my.cnf into "option->ssl_cipher"

diff -Nrup a/sql-common/client.c b/sql-common/client.c
--- a/sql-common/client.c	2007-07-22 11:03:15 +02:00
+++ b/sql-common/client.c	2007-11-16 10:43:58 +01:00
@@ -1085,11 +1085,16 @@ void mysql_read_default_options(struct s
 	  my_free(options->ssl_capath, MYF(MY_ALLOW_ZERO_PTR));
           options->ssl_capath = my_strdup(opt_arg, MYF(MY_WME));
           break;
+        case 26:			/* ssl_cipher */
+          my_free(options->ssl_cipher, MYF(MY_ALLOW_ZERO_PTR));
+          options->ssl_cipher= my_strdup(opt_arg, MYF(MY_WME));
+          break;
 #else
 	case 13:				/* Ignore SSL options */
 	case 14:
 	case 15:
 	case 16:
+        case 26:
 	  break;
 #endif /* HAVE_OPENSSL */
 	case 17:			/* charset-lib */
Thread
bk commit into 5.0 tree (msvensson:1.2524) BUG#32429msvensson16 Nov
  • Re: bk commit into 5.0 tree (msvensson:1.2524) BUG#32429Konstantin Osipov19 Nov