From f33fb18677d673f1bcb2d617355ea3e2dbb04f48 Mon Sep 17 00:00:00 2001
From: unknown <monty@hundin.mysql.fi>
Date: Mon, 26 Nov 2001 03:52:23 +0200
Subject: Patch for SCO Update test results for MySQL 4.0

extra/resolveip.c:
  Fix for SCO
mysql-test/r/backup.result:
  Update test results for MySQL 4.0
mysql-test/r/bdb-crash.result:
  Update test results for MySQL 4.0
mysql-test/r/bdb-deadlock.result:
  Update test results for MySQL 4.0
mysys/mf_casecnv.c:
  Patch for SCO
mysys/mf_qsort.c:
  Patch for SCO
mysys/my_compress.c:
  Patch for SCO
strings/ctype.c:
  Patch for SCO
---
 extra/resolveip.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'extra/resolveip.c')

diff --git a/extra/resolveip.c b/extra/resolveip.c
index cb33e275b9d..8b2644ab423 100644
--- a/extra/resolveip.c
+++ b/extra/resolveip.c
@@ -23,7 +23,9 @@
 #include <m_ctype.h>
 #include <my_net.h>
 #include <my_sys.h>
+#ifndef SCO
 #include <m_string.h>
+#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #ifndef HAVE_BROKEN_NETINET_INCLUDES
-- 
cgit v1.2.1