diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-09 16:47:16 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-09 16:47:16 +0300 |
| commit | 6974c3d07a1617cb24cd88b5414a4500b90a5699 (patch) | |
| tree | 9e6ce887604db3116c5f936a79eaa6915877323e /client/mysql.cc | |
| parent | 47733b486a23441563ff5090fa12130a4a03eb47 (diff) | |
| download | mariadb-git-6974c3d07a1617cb24cd88b5414a4500b90a5699.tar.gz | |
Fix for SSL and new my_getopt
Fix for syntax error bug in SET TRANSACTION ISOLATION
BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997:
Delete: include/sslopt-case.h
client/mysql.cc:
Fix for SSL and new my_getopt
client/mysqladmin.c:
Fix for SSL and new my_getopt
client/mysqlcheck.c:
Fix for SSL and new my_getopt
client/mysqldump.c:
Fix for SSL and new my_getopt
client/mysqlimport.c:
Fix for SSL and new my_getopt
client/mysqlshow.c:
Fix for SSL and new my_getopt
include/Makefile.am:
Fix for SSL and new my_getopt
include/sslopt-longopts.h:
Fix for SSL and new my_getopt
libmysql/libmysql.c:
Fix for SSL and new my_getopt
mysql-test/r/innodb.result:
Simple test of transaction isolations
mysql-test/t/innodb.test:
Simple test of transaction isolations
sql/mini_client.cc:
Merge of mysql_real_connect() with libmysql.c
sql/mysqld.cc:
Simple test of transaction isolations
Remove use of current_thd in get_options()
sql/slave.cc:
Indentation cleanup
sql/sql_yacc.yy:
Fix for SET TRANSACTION ...
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 460d47c75da..77823b1087f 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -391,13 +391,6 @@ int main(int argc,char *argv[]) sig_handler mysql_end(int sig) { mysql_close(&mysql); -#ifdef HAVE_OPENSSL - my_free(opt_ssl_key,MYF(MY_ALLOW_ZERO_PTR)); - my_free(opt_ssl_cert,MYF(MY_ALLOW_ZERO_PTR)); - my_free(opt_ssl_ca,MYF(MY_ALLOW_ZERO_PTR)); - my_free(opt_ssl_capath,MYF(MY_ALLOW_ZERO_PTR)); - my_free(opt_ssl_cipher,MYF(MY_ALLOW_ZERO_PTR)); -#endif #ifdef HAVE_READLINE if (!status.batch && !quick && !opt_html && !opt_xml) { @@ -709,7 +702,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), case '?': usage(0); exit(0); -#include "sslopt-case.h" } return 0; } @@ -2209,6 +2201,9 @@ sql_real_connect(char *host,char *database,char *user,char *password, if (using_opt_local_infile) mysql_options(&mysql,MYSQL_OPT_LOCAL_INFILE, (char*) &opt_local_infile); #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, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, opt_ssl_capath, opt_ssl_cipher); |