mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 23:54:31 +02:00
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 ...
This commit is contained in:
parent
47733b486a
commit
6974c3d07a
16 changed files with 141 additions and 122 deletions
|
|
@ -85,6 +85,9 @@ int main(int argc, char **argv)
|
|||
if (opt_compress)
|
||||
mysql_options(&mysql,MYSQL_OPT_COMPRESS,NullS);
|
||||
#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);
|
||||
|
|
@ -218,7 +221,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||
opt_mysql_unix_port=MYSQL_NAMEDPIPE;
|
||||
#endif
|
||||
break;
|
||||
#include "sslopt-case.h"
|
||||
case '#':
|
||||
DBUG_PUSH(argument ? argument : "d:t:o");
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue