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 /libmysql | |
| 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 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 7cd607b702e..bc07bf0367c 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1436,7 +1436,6 @@ mysql_ssl_set(MYSQL *mysql __attribute__((unused)) , mysql->options.ssl_ca= strdup_if_not_null(ca); mysql->options.ssl_capath= strdup_if_not_null(capath); mysql->options.ssl_cipher= strdup_if_not_null(cipher); - mysql->options.use_ssl= TRUE; mysql->connector_fd = (gptr) new_VioSSLConnectorFd(key, cert, ca, capath, cipher); DBUG_PRINT("info",("mysql_ssl_set, context: %p", @@ -1808,6 +1807,10 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, client_flag|=CLIENT_CAPABILITIES; #ifdef HAVE_OPENSSL + if (mysql->options.ssl_key || mysql->options.ssl_cert || + mysql->options.ssl_ca || mysql->options.ssl_capath || + mysql->options.ssl_cipher) + mysql->options.use_ssl= 1; if (mysql->options.use_ssl) client_flag|=CLIENT_SSL; #endif /* HAVE_OPENSSL */ |