diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-09-17 23:46:53 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-09-17 23:46:53 +0300 |
| commit | f0fbecca27b1a5b754636b9372b37454c28ec336 (patch) | |
| tree | c51e7c970efa7653918302f4513422428385158d /include/sslopt-case.h | |
| parent | ddcc49ec62c271a4f022a673b39c8693ed4e7a86 (diff) | |
| download | mariadb-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 'include/sslopt-case.h')
| -rw-r--r-- | include/sslopt-case.h | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/include/sslopt-case.h b/include/sslopt-case.h new file mode 100644 index 00000000000..ea23c31aa82 --- /dev/null +++ b/include/sslopt-case.h @@ -0,0 +1,29 @@ +/* Copyright (C) 2000 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#ifdef HAVE_OPENSSL + case OPT_SSL_KEY: + case OPT_SSL_CERT: + case OPT_SSL_CA: + case OPT_SSL_CAPATH: + case OPT_SSL_CIPHER: + /* + Enable use of SSL if we are using any ssl option + One can disable SSL later by using --skip-ssl or --ssl=0 + */ + opt_use_ssl= 1; + break; +#endif |