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 /sql/sql_parse.cc | |
| 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 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 0fe8ccb881f..0c53e76bd88 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -425,7 +425,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...")); - net->vio = sslaccept(ssl_acceptor_fd, 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) |