1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pilot.mysql.com:/data/msvensson/mysql/bug32429/my50-bug32429

Browse Source 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-runtime
This commit is contained in:
unknown 2007-11-26 20:08:32 +01:00
commit 7917c7c060
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql-common/client.c
View File

@ -1085,11 +1085,16 @@ void mysql_read_default_options(struct st_mysql_options *options,
my_free(options->ssl_capath, MYF(MY_ALLOW_ZERO_PTR)); my_free(options->ssl_capath, MYF(MY_ALLOW_ZERO_PTR));
options->ssl_capath = my_strdup(opt_arg, MYF(MY_WME)); options->ssl_capath = my_strdup(opt_arg, MYF(MY_WME));
break; 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 #else
case 13: /* Ignore SSL options */ case 13: /* Ignore SSL options */
case 14: case 14:
case 15: case 15:
case 16: case 16:
case 26:
break; break;
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
case 17: /* charset-lib */ case 17: /* charset-lib */