bk commit into 5.1 tree (joerg:1.1901)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1901 05/09/16 11:02:21 joerg@stripped +2 -0
  Merge the 5.0.13 clone changes up to 5.1

  configure.in
    1.300 05/09/16 11:02:15 joerg@stripped +0 -2
    Manual merge (= no change).

  include/my_global.h
    1.109 05/09/15 20:59:50 joerg@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/M51/merge-5.1/RESYNC

--- 1.108/include/my_global.h	2005-09-15 11:32:43 +02:00
+++ 1.109/include/my_global.h	2005-09-15 20:59:50 +02:00
@@ -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