From 1c64f355b4e0bb7a709dd850857a9bb41b11d09c Mon Sep 17 00:00:00 2001
From: unknown <monty@hundin.mysql.fi>
Date: Tue, 9 Oct 2001 03:35:29 +0300
Subject: One should not only have to include my_net.h to work with sockets.
 This wrapper noew will include all the necessary, system specific files,
 which makes all normal source files much easier to write and maintain.
 Portability fixes.

Docs/manual.texi:
  Updated upgrading from 3.23 -> 4.0
client/mysqladmin.c:
  Portability fixes
client/mysqlshow.c:
  Portability fixes
extra/resolveip.c:
  Portability fixes
include/my_global.h:
  Portability fixes
include/my_net.h:
  One should not only have to include my_net.h to work with sockets.
  This wrapper noew will include all the necessary, system specific files,
  which makes all normal source files much easier to write and maintain.
include/mysql_com.h:
  Portability fixes
libmysql/net.c:
  Portability fixes
libmysqld/lib_vio.c:
  Portability fixes
mysql-test/r/drop.result:
  Fix crashed tests
mysql-test/r/err000001.result:
  Fix crashed tests
mysql-test/r/innodb.result:
  Fix crashed tests
mysql-test/r/overflow.result:
  Fix crashed tests
sql/net_serv.cc:
  Use new my_net.h
vio/vio.c:
  Use new my_net.h
vio/viosocket.c:
  Use new my_net.h
vio/viossl.c:
  Use new my_net.h
---
 libmysql/net.c | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'libmysql/net.c')

diff --git a/libmysql/net.c b/libmysql/net.c
index 44e3dd14f80..5e002a0f63e 100644
--- a/libmysql/net.c
+++ b/libmysql/net.c
@@ -31,16 +31,16 @@
 #include <winsock.h>
 #endif
 #include <my_global.h>
-#include "mysql_embed.h"
+#include <mysql.h>
+#include <mysql_embed.h>
 #include <mysql_com.h>
-#include <violite.h>
+#include <mysqld_error.h>
 #include <my_sys.h>
 #include <m_string.h>
-#include "mysql.h"
-#include "mysqld_error.h"
+#include <my_net.h>
+#include <violite.h>
 #include <signal.h>
 #include <errno.h>
-#include <sys/types.h>
 
 #ifdef MYSQL_SERVER
 ulong max_allowed_packet=65536;
@@ -60,20 +60,9 @@ ulong net_write_timeout= NET_WRITE_TIMEOUT;
 #endif
 ulong net_buffer_length=8192;	/* Default length. Enlarged if necessary */
 
-#if !defined(__WIN__) && !defined(MSDOS)
-#include <sys/socket.h>
-#else
+#if defined(__WIN__) || defined(MSDOS)
 #undef MYSQL_SERVER			/* Win32 can't handle interrupts */
 #endif
-#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__)
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#if !defined(alpha_linux_port)
-#include <netinet/tcp.h>
-#endif
-#endif
-#include "mysqld_error.h"
 #ifdef MYSQL_SERVER
 #include "my_pthread.h"
 #include "thr_alarm.h"
-- 
cgit v1.2.1