From 60589aeee03949033c66da5c1eae70d4342179fc Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Tue, 14 Aug 2012 17:23:34 +0300 Subject: Next part of merge. See TODO for details --- client/mysqlslap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'client/mysqlslap.c') diff --git a/client/mysqlslap.c b/client/mysqlslap.c index e3da44e2fc5..45846948b21 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -66,7 +66,7 @@ TODO: */ -#define SLAP_VERSION "1.0" +#define SLAP_VERSION "1.1" #define HUGE_STRING_LENGTH 8196 #define RAND_STRING_SIZE 126 @@ -299,8 +299,12 @@ void set_mysql_connect_options(MYSQL *mysql) mysql_options(mysql,MYSQL_OPT_COMPRESS,NullS); #ifdef HAVE_OPENSSL if (opt_use_ssl) + { mysql_ssl_set(mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, opt_ssl_capath, opt_ssl_cipher); + mysql_options(mysql, MYSQL_OPT_SSL_CRL, opt_ssl_crl); + mysql_options(mysql, MYSQL_OPT_SSL_CRLPATH, opt_ssl_crlpath); + } #endif if (opt_protocol) mysql_options(mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol); -- cgit v1.2.1