diff options
| author | unknown <jimw@mysql.com> | 2005-06-20 15:02:45 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-06-20 15:02:45 -0700 |
| commit | 3f6501c5e5eb3a793cc7bcafbcfe0abb129693ad (patch) | |
| tree | 771ab84f683c6b6d523ddedf80755c104e17cca7 /vio/viosocket.c | |
| parent | 2bf4fa73de38c2d353a9b1263f80251b4641419a (diff) | |
| parent | e17de6ecb472e84c7f826f6ac77c236ce952b9a8 (diff) | |
| download | mariadb-git-3f6501c5e5eb3a793cc7bcafbcfe0abb129693ad.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
client/mysql.cc:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
vio/viosocket.c:
Auto merged
Diffstat (limited to 'vio/viosocket.c')
| -rw-r--r-- | vio/viosocket.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index ee8e85880ba..c9df242b5c4 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -425,6 +425,7 @@ int vio_close_pipe(Vio * vio) void vio_ignore_timeout(Vio *vio __attribute__((unused)), + uint which __attribute__((unused)), uint timeout __attribute__((unused))) { } |