diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-08-27 02:51:39 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-08-27 02:51:39 +0300 |
| commit | 5e3979fb2e309c5498a06e367c60d7344f973be0 (patch) | |
| tree | df46d43bd0139e95a2e8a1f4acac68f2de3c484f /libmysqld | |
| parent | 8a01c6539fe7a7d8763d02f9f4b911422b6ec6c1 (diff) | |
| download | mariadb-git-5e3979fb2e309c5498a06e367c60d7344f973be0.tar.gz | |
vio ssl structure renames (to get rid of ending _)
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f:
Delete: mysql-test/include/have_openssl_2.inc
BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514:
Delete: mysql-test/r/have_openssl_2.require
BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8:
Delete: mysql-test/t/openssl_2.test
BitKeeper/etc/ignore:
added libmysql/vio_priv.h libmysql_r/vio_priv.h
client/mysql.cc:
vio ssl structure renames
include/violite.h:
Cleanup violite.h interface (move things to vio_priv.h)
libmysql/Makefile.am:
Use vio_priv.h
libmysql/Makefile.shared:
Use vio_priv.h
libmysqld/lib_vio.c:
Added timeout for windows
mysys/my_getopt.c:
Indentaion cleanup
sql/item_cmpfunc.cc:
Remove compiler warnings
sql/item_func.cc:
Remove compiler warnings
sql/mini_client.cc:
vio ssl structure renames
sql/mysqld.cc:
Check on windows if second server is started with same TCP/IP port
sql/net_serv.cc:
Add read/write timeouts for windows
sql/sql_acl.cc:
vio ssl structure renames
sql/sql_show.cc:
vio ssl structure renames
vio/vio.c:
Added timeouts for windows
vio/viosocket.c:
Added timeouts for windows
vio/viossl.c:
Added timeouts for windows
Cleaned up structure element names
vio/viosslfactories.c:
Added timeouts for windows
Cleaned up structure element names
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_vio.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libmysqld/lib_vio.c b/libmysqld/lib_vio.c index 448c11f9abd..ccad6ac8b7e 100644 --- a/libmysqld/lib_vio.c +++ b/libmysqld/lib_vio.c @@ -218,4 +218,9 @@ my_bool vio_poll_read(Vio *vio,uint timeout) return 0; } + +void vio_timeout(Vio *vio __attribute__((unused)), + uint timeout __attribute__((unused))) +{ +} #endif /* HAVE_VIO */ |