diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-11-26 20:08:32 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-11-26 20:08:32 +0100 |
| commit | 7917c7c06020624c0e24a254f5e9ca5c19a314aa (patch) | |
| tree | 1c711ac042637d93ba183f2396d2b7322c27a3e0 /sql-common | |
| parent | 2823d879fc18927daa8fb57bc754d1003725b01c (diff) | |
| parent | 0b7dad09acaf9e790f2e0a7f29aaddd0d9b07120 (diff) | |
| download | mariadb-git-7917c7c06020624c0e24a254f5e9ca5c19a314aa.tar.gz | |
Merge pilot.mysql.com:/data/msvensson/mysql/bug32429/my50-bug32429
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-runtime
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 */ |