diff options
| author | msvensson@pilot.mysql.com <> | 2007-11-16 10:43:59 +0100 |
|---|---|---|
| committer | msvensson@pilot.mysql.com <> | 2007-11-16 10:43:59 +0100 |
| commit | 55cb6d64c3f9d22cb04bfab18cb26b6b5356df97 (patch) | |
| tree | 4684f03723144723f5327ef677b938bea5ad0d42 /sql-common | |
| parent | f4b671d8bc1ab80342918820a2bc841c5542d57d (diff) | |
| download | mariadb-git-55cb6d64c3f9d22cb04bfab18cb26b6b5356df97.tar.gz | |
Bug#32429 ssl_cipher setting in my.cnf not read by libmysqlclient
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index cb1d224ef2e..1fc73549520 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1085,11 +1085,16 @@ void mysql_read_default_options(struct st_mysql_options *options, 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 */ |