mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Fix for SSL and new my_getopt
Fix for syntax error bug in SET TRANSACTION ISOLATION
This commit is contained in:
@@ -246,7 +246,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
||||
verbose++;
|
||||
break;
|
||||
case 'V': print_version(); exit(0);
|
||||
#include "sslopt-case.h"
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -530,6 +529,9 @@ static int dbConnect(char *host, char *user, char *passwd)
|
||||
if (opt_compress)
|
||||
mysql_options(&mysql_connection, MYSQL_OPT_COMPRESS, NullS);
|
||||
#ifdef HAVE_OPENSSL
|
||||
if (opt_ssl_key || opt_ssl_cert || opt_ssl_ca || opt_ssl_capath ||
|
||||
opt_ssl_cipher)
|
||||
opt_use_ssl= 1;
|
||||
if (opt_use_ssl)
|
||||
mysql_ssl_set(&mysql_connection, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,
|
||||
opt_ssl_capath, opt_ssl_cipher);
|
||||
|
||||
Reference in New Issue
Block a user