mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge work:/my/mysql-4.0 into hundin.mysql.fi:/home/tim/mysql-4.0

Browse source
This commit is contained in:
tim@hundin.mysql.fi 2001-06-05 04:18:23 +03:00
commit ae9e69efe3
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View file

@ -7,5 +7,6 @@ paul@central.snake.net
paul@teton.kitebird.com paul@teton.kitebird.com
sasha@mysql.sashanet.com sasha@mysql.sashanet.com
serg@serg.mysql.com serg@serg.mysql.com
tim@hundin.mysql.fi
tim@threads.polyesthetic.msg tim@threads.polyesthetic.msg
tonu@hundin.mysql.fi tonu@hundin.mysql.fi

7
include/violite.h
View file

@ -143,10 +143,6 @@ extern "C" {
void vio_ssl_delete(Vio* vio); void vio_ssl_delete(Vio* vio);
#ifdef EMBEDDED_LIBRARY
void vio_reset(Vio *vio);
#endif
int vio_ssl_read(Vio* vio,gptr buf, int size); int vio_ssl_read(Vio* vio,gptr buf, int size);
int vio_ssl_write(Vio* vio,const gptr buf,int size); int vio_ssl_write(Vio* vio,const gptr buf,int size);
int vio_ssl_blocking(Vio* vio,my_bool onoff); int vio_ssl_blocking(Vio* vio,my_bool onoff);
@ -220,6 +216,7 @@ Vio* new_VioSSL(struct st_VioSSLAcceptorFd* fd, Vio* sd,int state);
#define HANDLE void * #define HANDLE void *
#endif #endif
#ifndef EMBEDDED_LIBRARY
/* This structure is for every connection on both sides */ /* This structure is for every connection on both sides */
struct st_vio struct st_vio
{ {
@ -254,5 +251,5 @@ struct st_vio
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
#endif /* HAVE_VIO */ #endif /* HAVE_VIO */
}; };
#endif /* EMBEDDED_LIBRARY */