diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-08 16:41:04 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-08 16:41:04 +0300 |
| commit | 028cfaba9ba0fcbba30511e6951daab6a1829f20 (patch) | |
| tree | 8abd660ca8962e8c1a9aa58dbabd22e3c2e6f163 /vio/test-ssl.c | |
| parent | 267b80834ad524c0d72976bc71e5b5bc9815ea1a (diff) | |
| download | mariadb-git-028cfaba9ba0fcbba30511e6951daab6a1829f20.tar.gz | |
Fix after merge
Updated WEEK() and DATE information in the manual.
Docs/manual.texi:
Updated WEEK() information.
Added more information of how MySQL stores dates.
libmysql/Makefile.am:
Fix after merge
libmysqld/lib_vio.c:
Use new vio_blocking()
mysql-test/r/group_by.result:
Update results after merge
sql/ha_innodb.cc:
Fix after merge
sql/lex.h:
Fix after merge
sql/slave.cc:
Added missing include file
sql/sql_base.cc:
Added function comments
vio/test-ssl.c:
Fix after merge
Diffstat (limited to 'vio/test-ssl.c')
| -rw-r--r-- | vio/test-ssl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vio/test-ssl.c b/vio/test-ssl.c index 9fdab86e9b9..acce201bfba 100644 --- a/vio/test-ssl.c +++ b/vio/test-ssl.c @@ -59,6 +59,7 @@ main( int argc, char* ca_file = 0, *ca_path = 0; char* cipher=0; int child_pid,sv[2]; + my_bool unused; struct st_VioSSLAcceptorFd* ssl_acceptor=0; struct st_VioSSLConnectorFd* ssl_connector=0; Vio* client_vio=0, *server_vio=0; @@ -96,11 +97,11 @@ main( int argc, client_vio = (struct st_vio*)my_malloc(sizeof(struct st_vio),MYF(0)); client_vio->sd = sv[0]; - client_vio->vioblocking(client_vio,0); + client_vio->vioblocking(client_vio, 0, &unused); sslconnect(ssl_connector,client_vio,60L); server_vio = (struct st_vio*)my_malloc(sizeof(struct st_vio),MYF(0)); server_vio->sd = sv[1]; - server_vio->vioblocking(client_vio,0); + server_vio->vioblocking(client_vio, 0, &unused); sslaccept(ssl_acceptor,server_vio,60L); printf("Socketpair: %d , %d\n", client_vio->sd, server_vio->sd); |