Commit 387464d2 authored by unknown's avatar unknown
Browse files

Merge the 5.0.13 clone changes up to 5.1 


include/my_global.h:
  Auto merged
configure.in:
  Manual merge (= no change).
parents 7866bf64 f7bcd099

include/my_global.h

+8 −0
Original line number Diff line number Diff line
@@ -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