diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-10-07 14:18:09 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-10-07 14:18:09 +0300 |
| commit | 63c7276f365c4f00168d75e3a1d63bb959df1dc1 (patch) | |
| tree | ae1d8d4885a5aa3e83ca4246b189760e128283c3 /libmysql | |
| parent | 9def70036f82bc3d9338b1584226451bbe88ab96 (diff) | |
| download | mariadb-git-63c7276f365c4f00168d75e3a1d63bb959df1dc1.tar.gz | |
Fix for 'mysqladmin -w1 unknown-command'
Manual Changelog update
Docs/manual.texi:
Changelog
client/mysqladmin.c:
Fix for 'mysqladmin -w1 unknown-command'
libmysql/violite.c:
Fix for TCP_NODELAY
mysql-test/mysql-test-run.sh:
Portability fixes
sql/sql_lex.cc:
Cleanup
sql/sql_lex.h:
Cleanup
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/violite.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libmysql/violite.c b/libmysql/violite.c index 0d96c71969c..51940552bb9 100644 --- a/libmysql/violite.c +++ b/libmysql/violite.c @@ -39,6 +39,13 @@ #include <sys/ioctl.h> #endif +#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) +#include <netinet/ip.h> +#if !defined(alpha_linux_port) +#include <netinet/tcp.h> +#endif +#endif + #if defined(__EMX__) || defined(OS2) #define ioctlsocket ioctl #endif /* defined(__EMX__) */ |