diff options
| author | tonu@x153.internalnet <> | 2001-07-24 15:00:36 +0800 |
|---|---|---|
| committer | tonu@x153.internalnet <> | 2001-07-24 15:00:36 +0800 |
| commit | e1fa72edef329ff18cd4cce31e15822b3a432d2c (patch) | |
| tree | c83d351c310d448d629eb358d6f4f5c22f640651 /libmysql/libmysql.c | |
| parent | 27caeeac7ffaedfa10178d4106518ff1227feefc (diff) | |
| parent | 85c287a43937ecbafc67dde08b438c60ed1f659f (diff) | |
| download | mariadb-git-e1fa72edef329ff18cd4cce31e15822b3a432d2c.tar.gz | |
Merge work.mysql.com:/home/bk/mysql-4.0
into x153.internalnet:/home/tonu/mysql-x
Diffstat (limited to 'libmysql/libmysql.c')
| -rw-r--r-- | libmysql/libmysql.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 9fe9da416c3..22b3c75fcb9 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1372,7 +1372,7 @@ mysql_ssl_cipher(MYSQL *mysql) ** Free strings in the SSL structure and clear 'use_ssl' flag. ** NB! Errors are not reported until you do mysql_real_connect. ************************************************************************** - +*/ int STDCALL mysql_ssl_clear(MYSQL *mysql) { @@ -1384,11 +1384,11 @@ mysql_ssl_clear(MYSQL *mysql) mysql->options.ssl_cert = 0; mysql->options.ssl_ca = 0; mysql->options.ssl_capath = 0; - mysql->options.use_ssl = false; - mysql->connector_fd->delete(); + mysql->options.use_ssl = FALSE; + my_free(mysql->connector_fd,MYF(MY_ALLOW_ZERO_PTR)); mysql->connector_fd = 0; return 0; -}*/ +} #endif /* HAVE_OPENSSL */ /************************************************************************** @@ -1781,7 +1781,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, /* Do the SSL layering. */ DBUG_PRINT("info", ("IO layer change in progress...")); DBUG_PRINT("info", ("IO context %p",((struct st_VioSSLConnectorFd*)mysql->connector_fd)->ssl_context_)); - mysql->net.vio = sslconnect((struct st_VioSSLConnectorFd*)(mysql->connector_fd),mysql->net.vio); + sslconnect((struct st_VioSSLConnectorFd*)(mysql->connector_fd),mysql->net.vio); DBUG_PRINT("info", ("IO layer change done!")); } #endif /* HAVE_OPENSSL */ @@ -1984,8 +1984,7 @@ mysql_close(MYSQL *mysql) bzero((char*) &mysql->options,sizeof(mysql->options)); mysql->net.vio = 0; #ifdef HAVE_OPENSSL -/* ((VioConnectorFd*)(mysql->connector_fd))->delete(); - mysql->connector_fd = 0;*/ + mysql_ssl_clear(mysql); #endif /* HAVE_OPENSSL */ /* free/close slave list */ |