diff options
| author | unknown <tonu@x153.internalnet> | 2001-07-24 15:00:36 +0800 |
|---|---|---|
| committer | unknown <tonu@x153.internalnet> | 2001-07-24 15:00:36 +0800 |
| commit | 55fbccfd81b61934c75082006b8c53c01a666359 (patch) | |
| tree | c83d351c310d448d629eb358d6f4f5c22f640651 /libmysql | |
| parent | cab947d58a123384489541dfd3b681ca15c298a2 (diff) | |
| parent | 2ec8dce13dc2357179244e73e97648034b7cc5a6 (diff) | |
| download | mariadb-git-55fbccfd81b61934c75082006b8c53c01a666359.tar.gz | |
Merge work.mysql.com:/home/bk/mysql-4.0
into x153.internalnet:/home/tonu/mysql-x
BitKeeper/etc/logging_ok:
auto-union
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
libmysql/libmysql.c:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.am | 2 | ||||
| -rw-r--r-- | libmysql/Makefile.shared | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 13 |
3 files changed, 8 insertions, 9 deletions
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index 67b78f14ba2..6c471090533 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -21,7 +21,7 @@ target = libmysqlclient.la target_defs = -DUNDEF_THREADS_HACK LIBS = @CLIENT_LIBS@ INCLUDES = -I$(srcdir)/../include -I../include \ - -I$(srcdir)/.. -I$(top_srcdir) -I.. + -I$(srcdir)/.. -I$(top_srcdir) -I.. $(openssl_includes) include $(srcdir)/Makefile.shared diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index 4d3928c5bc5..28248a0b982 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -62,7 +62,7 @@ mysysobjects = $(mysysobjects1) $(mysysobjects2) target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects) \ $(vio_objects) target_ldflags = -version-info @SHARED_LIB_VERSION@ -vio_objects= vio.lo viosocket.lo +vio_objects= vio.lo viosocket.lo viossl.lo viosslfactories.lo CLEANFILES = $(target_libadd) $(SHLIBOBJS) \ $(target) DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ 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 */ |