mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Merge the 5.0.13 clone changes up to 5.1
include/my_global.h: Auto merged configure.in: Manual merge (= no change).
This commit is contained in:
commit
387464d267
1 changed files with 8 additions and 0 deletions
|
@ -195,6 +195,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
|
||||
|
|
Loading…
Reference in a new issue