1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge the 5.0.13 clone changes up to 5.1

Browse Source 
include/my_global.h:
  Auto merged
configure.in:
  Manual merge (= no change).
This commit is contained in:
unknown 2005-09-16 11:02:21 +02:00
commit 387464d267
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/my_global.h
View File

@ -195,6 +195,14 @@
#define _GNU_SOURCE 1 #define _GNU_SOURCE 1
#endif #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 */ /* The client defines this to avoid all thread code */
#if defined(UNDEF_THREADS_HACK) #if defined(UNDEF_THREADS_HACK)
#undef THREAD #undef THREAD