summaryrefslogtreecommitdiff
path: root/client/mysql.cc
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2002-09-17 23:46:53 +0300
committerunknown <monty@mashka.mysql.fi>2002-09-17 23:46:53 +0300
commitf0fbecca27b1a5b754636b9372b37454c28ec336 (patch)
treec51e7c970efa7653918302f4513422428385158d /client/mysql.cc
parentddcc49ec62c271a4f022a673b39c8693ed4e7a86 (diff)
downloadmariadb-git-f0fbecca27b1a5b754636b9372b37454c28ec336.tar.gz
fixed so that --ssl and --skip-ssl works with the MySQL clients.
Fixed core dump bug when sending wrong string to AES_DECRYPT() BitKeeper/deleted/.del-explain_log.sh~e570be5f63576fe1: Delete: scripts/explain_log.sh Docs/manual.texi: Updated bug reporting. Added somew new changelog entries and changed some old client/mysql.cc: Fixed so that --ssl and --skip-ssl works client/mysqladmin.c: Fixed so that --ssl and --skip-ssl works client/mysqlcheck.c: Fixed so that --ssl and --skip-ssl works client/mysqldump.c: Fixed so that --ssl and --skip-ssl works client/mysqlimport.c: Fixed so that --ssl and --skip-ssl works client/mysqlshow.c: Fixed so that --ssl and --skip-ssl works include/sslopt-case.h: Fixed so that --ssl and --skip-ssl works mysql-test/r/func_str.result: Test of problem with AES_DECRYPT() mysql-test/t/func_str.test: Test of problem with AES_DECRYPT() mysys/my_aes.c: Fixed problem with wrong decrypt string. scripts/mysql_explain_log.sh: Applied missed patch sql/item_strfunc.cc: Fixed aes_encrypt() and aes_decrypt() to be safer and avoid some mallocs() sql/net_pkg.cc: Return ER_UNKNOWN_ERROR instead of errocode 0 in some cases.
Diffstat (limited to 'client/mysql.cc')
-rw-r--r--client/mysql.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index eaf80a1014e..ec5eb01d0e7 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -2209,9 +2209,6 @@ 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);