diff options
| author | malff@lambda.hsd1.co.comcast.net. <> | 2007-11-28 09:08:31 -0700 |
|---|---|---|
| committer | malff@lambda.hsd1.co.comcast.net. <> | 2007-11-28 09:08:31 -0700 |
| commit | de0175204d4364bfb028b4f9b483e47b5b8593ac (patch) | |
| tree | c16ea7b2aa0862bd06c1ec835cb8687fbea54c4d /sql-common | |
| parent | a8bb77239292cbc9095f152b2971e10b19616b38 (diff) | |
| parent | 7c4f906bf3b25489c31cc257a165750e18520443 (diff) | |
| download | mariadb-git-de0175204d4364bfb028b4f9b483e47b5b8593ac.tar.gz | |
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
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 0ca7ef16c0d..f149442f12e 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1097,11 +1097,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 */ |