diff options
| author | unknown <tonu@volk.internalnet> | 2001-09-30 10:47:32 +0800 |
|---|---|---|
| committer | unknown <tonu@volk.internalnet> | 2001-09-30 10:47:32 +0800 |
| commit | 6e8704ee0993b4f06d1c3626291346d20c6d60cb (patch) | |
| tree | 23320c30b5375f656671ecf64934369738776dda /sql/mini_client.cc | |
| parent | ad9c7236a026395e5d7e6faf7ec83689f631ca40 (diff) | |
| parent | d13f2dfdeb2b23c6abfb608885e8717878122a7b (diff) | |
| download | mariadb-git-6e8704ee0993b4f06d1c3626291346d20c6d60cb.tar.gz | |
Merge work.mysql.com:/home/bk/mysql-4.0
into volk.internalnet:/home/tonu/mysql-4.0
acinclude.m4:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/structs.h:
Auto merged
Docs/manual.texi:
Auto merged
Diffstat (limited to 'sql/mini_client.cc')
| -rw-r--r-- | sql/mini_client.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc index d60a3bce880..266a292fe1d 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -803,7 +803,7 @@ mc_mysql_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_)); - sslconnect((struct st_VioSSLConnectorFd*)(mysql->connector_fd),mysql->net.vio); + sslconnect((struct st_VioSSLConnectorFd*)(mysql->connector_fd),mysql->net.vio,60L); DBUG_PRINT("info", ("IO layer change done!")); } #endif /* HAVE_OPENSSL */ |