From 6974c3d07a1617cb24cd88b5414a4500b90a5699 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 9 Aug 2002 16:47:16 +0300 Subject: 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 ... --- client/mysqladmin.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'client/mysqladmin.c') diff --git a/client/mysqladmin.c b/client/mysqladmin.c index d6232a38f64..a62d587f3b1 100644 --- a/client/mysqladmin.c +++ b/client/mysqladmin.c @@ -222,7 +222,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), else option_wait= ~0; break; -#include "sslopt-case.h" case '?': case 'I': /* Info */ error++; @@ -275,10 +274,13 @@ int main(int argc,char *argv[]) mysql_options(&mysql,MYSQL_OPT_CONNECT_TIMEOUT, (char*) &tmp); } #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); -#endif /* HAVE_OPENSSL */ +#endif if (sql_connect(&mysql, option_wait)) error = 1; else -- cgit v1.2.1