1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00

Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

sql/ha_innobase.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
This commit is contained in:
unknown
2001-10-23 10:54:12 +02:00
32 changed files with 57 additions and 34 deletions

View File

@@ -39,7 +39,7 @@
#include <sys/ioctl.h>
#endif
#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__)
#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) && !defined(__FreeBSD__)
#include <netinet/ip.h>
#if !defined(alpha_linux_port)
#include <netinet/tcp.h>