diff options
| author | monty@hundin.mysql.fi <> | 2002-08-09 16:47:16 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-08-09 16:47:16 +0300 |
| commit | ac6e640c4dede507d9d9c8f43836785e4b47ae63 (patch) | |
| tree | 9e6ce887604db3116c5f936a79eaa6915877323e /client/mysqlimport.c | |
| parent | 7616da973d744d84d6e5abd9f4d1a8fbd2d74811 (diff) | |
| download | mariadb-git-ac6e640c4dede507d9d9c8f43836785e4b47ae63.tar.gz | |
Fix for SSL and new my_getopt
Fix for syntax error bug in SET TRANSACTION ISOLATION
Diffstat (limited to 'client/mysqlimport.c')
| -rw-r--r-- | client/mysqlimport.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 1933ea41bcf..e7af106abbb 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -193,7 +193,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), case '?': usage(); exit(0); -#include "sslopt-case.h" } return 0; } @@ -348,6 +347,9 @@ static MYSQL *db_connect(char *host, char *database, char *user, char *passwd) mysql_options(&mysql_connection,MYSQL_OPT_LOCAL_INFILE, (char*) &opt_local_file); #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); |