summaryrefslogtreecommitdiff
path: root/readline
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2001-02-03 18:00:29 +0200
committerunknown <monty@donna.mysql.com>2001-02-03 18:00:29 +0200
commit37aa09b19bba4f411b43be78cbc46b6a5f0aee95 (patch)
treeb01406ccbcbde61bdde5e643977c7f0fa76dc098 /readline
parent605c330184df49dc7e1187e88a038156d1799ce6 (diff)
downloadmariadb-git-37aa09b19bba4f411b43be78cbc46b6a5f0aee95.tar.gz
Workaround for bug in thread library in Unixware 7
Fixed bug in GROUP BY on ELT() Added SEQUENCE() to UDF examples BUILD/FINISH.sh: Avoid error message if tmp exists Docs/manual.texi: Cleaned up bug reporting section mysys/my_init.c: Workaround for bug in thread library in Unixware 7 readline/input.c: Portability fix scripts/mysql_install_db.sh: Made host, user and db field binary sql/item_func.h: Fixed bug in GROUP BY on ELT() sql/item_strfunc.cc: Fixed bug in GROUP BY on ELT() sql/share/Makefile.am: Don't automaticly checkout SCCS files sql/sql_select.cc: Cleanups sql/udf_example.cc: Added SEQUENCE() to UDF examples.
Diffstat (limited to 'readline')
-rw-r--r--readline/input.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/readline/input.c b/readline/input.c
index 00283504f57..e23af552494 100644
--- a/readline/input.c
+++ b/readline/input.c
@@ -41,9 +41,8 @@
# include "ansi_stdlib.h"
#endif /* HAVE_STDLIB_H */
-#include <time.h>
#if defined (HAVE_SELECT)
-# if !defined (HAVE_SYS_SELECT_H) || !defined (M_UNIX)
+# if !defined (HAVE_SYS_SELECT_H) || !defined (M_UNIX) || defined(TIME_WITH_SYS_TIME)
# include <sys/time.h>
# endif
#endif /* HAVE_SELECT */