diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-05-24 20:43:12 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-05-24 20:43:12 +0200 |
| commit | 71eb1afef15c103ff096104eef22049b8b4b0957 (patch) | |
| tree | c8363ff07bf3105b416bf81980b0f9609df81738 /include/violite.h | |
| parent | a27fd67b512bace048a8c9b0cce7faf5cbbd1373 (diff) | |
| parent | 945f3c2cc827ca6acc06a1034538f4ec1388ac5b (diff) | |
| download | mariadb-git-71eb1afef15c103ff096104eef22049b8b4b0957.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664
into pilot.blaudden:/home/msvensson/mysql/bug26664/my51-bug26664
include/mysql_com.h:
Auto merged
include/violite.h:
Auto merged
libmysql/libmysql.c:
Auto merged
server-tools/instance-manager/mysql_connection.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
vio/viosocket.c:
Auto merged
sql/sql_parse.cc:
Merge 5.0->5.1
Diffstat (limited to 'include/violite.h')
| -rw-r--r-- | include/violite.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/violite.h b/include/violite.h index 04365213ec0..a7ed021aa16 100644 --- a/include/violite.h +++ b/include/violite.h @@ -88,7 +88,6 @@ my_bool vio_peer_addr(Vio* vio, char *buf, uint16 *port); /* Remotes in_addr */ void vio_in_addr(Vio *vio, struct in_addr *in); my_bool vio_poll_read(Vio *vio,uint timeout); -void vio_timeout(Vio *vio,uint which, uint timeout); #ifdef HAVE_OPENSSL #include <openssl/opensslv.h> |