diff options
| author | unknown <tonu@hundin.mysql.fi> | 2001-05-31 17:18:25 +0300 |
|---|---|---|
| committer | unknown <tonu@hundin.mysql.fi> | 2001-05-31 17:18:25 +0300 |
| commit | 20d04c924b824de637e18750687dccbb28eb650c (patch) | |
| tree | 10378caa2d664f34da82d58a0fbe3f17c6ad6704 /sql/mini_client.cc | |
| parent | 3fc15fd38d003f456e0b7150d0bc6fca13624c4c (diff) | |
| download | mariadb-git-20d04c924b824de637e18750687dccbb28eb650c.tar.gz | |
Support for VIO library
Makefile.am:
Added vio
include/mysql_com.h:
Removed ancient defines from Vio++ times
include/violite.h:
Added vio
libmysql/Makefile.shared:
Removed sqlobject line with violite.lo
libmysql/libmysql.c:
Openssl stuff & sons
sql/Makefile.am:
Added vio
sql/mini_client.cc:
Added vio
sql/mysqld.cc:
Added vio
sql/net_serv.cc:
Added vio
sql/sql_parse.cc:
Added vio
vio/Makefile.am:
Removed C++ stuff
vio/vio.c:
st_vio -> Vio
vio/viosocket.c:
st_vio -> Vio
vio/viossl.c:
st_vio -> Vio
vio/viosslfactories.c:
vio.h-> violite.h
Diffstat (limited to 'sql/mini_client.cc')
| -rw-r--r-- | sql/mini_client.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc index b99e63a59d7..28119cc33fd 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -28,6 +28,7 @@ #include <odbcinst.h> #endif #include <global.h> +#include <violite.h> #include <my_sys.h> #include <mysys_err.h> #include <m_string.h> @@ -37,7 +38,6 @@ #include "mysql_version.h" #include "mysqld_error.h" #include "errmsg.h" -#include <violite.h> extern "C" { // Because of SCO 3.2V4.2 #include <sys/stat.h> @@ -748,18 +748,18 @@ mc_mysql_connect(MYSQL *mysql,const char *host, const char *user, #ifdef HAVE_OPENSSL /* Oops.. are we careful enough to not send ANY information */ /* without encryption? */ - if (client_flag & CLIENT_SSL) +/* if (client_flag & CLIENT_SSL) { if (my_net_write(net,buff,(uint) (2)) || net_flush(net)) - goto error; + goto error;*/ /* Do the SSL layering. */ - DBUG_PRINT("info", ("IO layer change in progress...")); + /* DBUG_PRINT("info", ("IO layer change in progress...")); VioSSLConnectorFd* connector_fd = (VioSSLConnectorFd*) (mysql->connector_fd); VioSocket* vio_socket = (VioSocket*)(mysql->net.vio); VioSSL* vio_ssl = connector_fd->connect(vio_socket); mysql->net.vio = (NetVio*)(vio_ssl); - } + }*/ #endif /* HAVE_OPENSSL */ int3store(buff+2,max_allowed_packet); @@ -829,8 +829,8 @@ mc_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; +/* ((VioConnectorFd*)(mysql->connector_fd))->delete(); + mysql->connector_fd = 0;*/ #endif /* HAVE_OPENSSL */ if (mysql->free_me) my_free((gptr) mysql,MYF(0)); |