Commit f035f5e0 authored by msvensson@pilot.mysql.com's avatar msvensson@pilot.mysql.com
Browse files

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

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-runtime
parents b894128b 55cb6d64

sql-common/client.c

+5 −0
Original line number Diff line number Diff line
@@ -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 */