mirror of
https://github.com/MariaDB/server.git
synced 2026-04-25 01:35:31 +02:00
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
This commit is contained in:
commit
3f6501c5e5
6 changed files with 11 additions and 5 deletions
|
|
@ -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)))
|
||||
{
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue