summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2005-09-15 20:43:00 +0200
committerunknown <joerg@mysql.com>2005-09-15 20:43:00 +0200
commit4ecb399fa33fe141de5aa99a7f634a32aeb8950e (patch)
treec215ffe4f8de89e0d2e31e73e3033b2ae7419d21
parentfa8082c4cb59a9659a3c4de19a9bfe3598351dc7 (diff)
parent3af139f84d35ef095a04d50000700108f67eb0c0 (diff)
downloadmariadb-git-4ecb399fa33fe141de5aa99a7f634a32aeb8950e.tar.gz
Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/mysql-5.0
-rw-r--r--include/my_global.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h
index 5bfcef2820f..48dd165dba1 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -107,6 +107,14 @@
#define _GNU_SOURCE 1
#endif
+/*
+ Temporary solution to solve bug#7156. Include "sys/types.h" before
+ the thread headers, else the function madvise() will not be defined
+*/
+#if defined(HAVE_SYS_TYPES_H) && ( defined(sun) || defined(__sun) )
+#include <sys/types.h>
+#endif
+
/* The client defines this to avoid all thread code */
#if defined(UNDEF_THREADS_HACK)
#undef THREAD