summaryrefslogtreecommitdiff
path: root/extra/resolveip.c
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-12-14 16:02:41 +0200
committerunknown <monty@hundin.mysql.fi>2001-12-14 16:02:41 +0200
commitc03330d584fd9c7f581d08df7a582ee76ec97d02 (patch)
tree63f5e7bab3c2b1c778016248af2350936a4c9763 /extra/resolveip.c
parent8dca301f4bdad2b069bcdfacad17e8af8c064366 (diff)
downloadmariadb-git-c03330d584fd9c7f581d08df7a582ee76ec97d02.tar.gz
Removed not used functions from sql_cache
Added new tests to testsuite. extra/resolveip.c: Portabilit fix. mysql-test/create-test-result: Fix for new mysql-test-run mysql-test/r/query_cache.result: Updated benchmarks mysql-test/t/query_cache-master.opt: Updated benchmarks mysql-test/t/query_cache.test: Updated benchmarks sql/sql_cache.cc: Removed not used functions sql/sql_cache.h: Removed not used functions
Diffstat (limited to 'extra/resolveip.c')
-rw-r--r--extra/resolveip.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/extra/resolveip.c b/extra/resolveip.c
index f540354edc3..2d21d5c672c 100644
--- a/extra/resolveip.c
+++ b/extra/resolveip.c
@@ -22,9 +22,7 @@
#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
@@ -34,10 +32,16 @@
#include <netdb.h>
#include <getopt.h>
+#ifdef SCO
+#undef h_errno
+#define h_errno errno
+#endif
+
#if !defined(_AIX) && !defined(HAVE_UNIXWARE7_THREADS) && !defined(HAVE_UNIXWARE7_POSIX) && !defined(h_errno)
extern int h_errno;
#endif
+
static int silent=0;
static struct option long_options[] =