diff options
Diffstat (limited to 'client/mysqlslap.c')
| -rw-r--r-- | client/mysqlslap.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index 035a7f0d..a52269f8 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -67,7 +67,7 @@ TODO: */ -#define SLAP_VERSION "1.0" +#define VER "1.0" #define HUGE_STRING_LENGTH 8196 #define RAND_STRING_SIZE 126 @@ -295,18 +295,7 @@ void set_mysql_connect_options(MYSQL *mysql) { if (opt_compress) 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); - mysql_options(mysql, MARIADB_OPT_TLS_VERSION, opt_tls_version); - } - mysql_options(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, - (char*)&opt_ssl_verify_server_cert); -#endif + SET_SSL_OPTS(mysql); if (opt_protocol) mysql_options(mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol); mysql_options(mysql, MYSQL_SET_CHARSET_NAME, default_charset); @@ -706,13 +695,6 @@ static struct my_option my_long_options[] = }; -static void print_version(void) -{ - printf("%s Ver %s Distrib %s, for %s (%s)\n",my_progname, SLAP_VERSION, - MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE); -} - - static void usage(void) { print_version(); |