diff options
| author | unknown <tonu@hundin.mysql.fi> | 2001-05-31 17:20:02 +0300 |
|---|---|---|
| committer | unknown <tonu@hundin.mysql.fi> | 2001-05-31 17:20:02 +0300 |
| commit | fb15124a944e408adb85162c057cd29914075c2d (patch) | |
| tree | c1a64eb64488865945cb214d2fbe04601a7a3c81 /sql/sql_parse.cc | |
| parent | e6ecbfd629bf92c84f270119405f4796464e7f4e (diff) | |
| parent | 20d04c924b824de637e18750687dccbb28eb650c (diff) | |
| download | mariadb-git-fb15124a944e408adb85162c057cd29914075c2d.tar.gz | |
Merge tonu@work.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/tonu/mysql-4.0
include/mysql_com.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index dc4e7358138..6ecae74043f 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -59,7 +59,7 @@ const char *command_name[]={ bool volatile abort_slave = 0; #ifdef HAVE_OPENSSL -extern VioSSLAcceptorFd* ssl_acceptor_fd; +extern struct st_VioSSLAcceptorFd * ssl_acceptor_fd; #endif /* HAVE_OPENSSL */ #ifdef __WIN__ @@ -423,9 +423,7 @@ check_connections(THD *thd) DBUG_PRINT("info", ("Agreed to change IO layer to SSL") ); /* Do the SSL layering. */ DBUG_PRINT("info", ("IO layer change in progress...")); - VioSocket* vio_socket = my_reinterpret_cast(VioSocket*)(net->vio); - VioSSL* vio_ssl = ssl_acceptor_fd->accept(vio_socket); - net->vio = my_reinterpret_cast(NetVio*) (vio_ssl); + net->vio = sslaccept(ssl_acceptor_fd, net->vio); DBUG_PRINT("info", ("Reading user information over SSL layer")); if ((pkt_len=my_net_read(net)) == packet_error || pkt_len < NORMAL_HANDSHAKE_SIZE) |