bk commit into 6.0 tree (gkodinov:1.2702) BUG#32632

[kgeorge]

Below is the list of changes that have just been committed into a local
6.0 repository of kgeorge. When kgeorge 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@stripped, 2007-11-29 13:08:26+02:00, gkodinov@stripped +1 -0
  Bug #32632: Compile failure on Mac/Intel with BUILD/compile-pentium
  
  The autoconf macro to check for pthread_yield_np was not
  discovered by autoheader.
  Fixed by extending the macro call and moving it inside the macro
  definition that handles pthread_yield.
  No test case necessary as this is a configure script change.

  config/ac-macros/misc.m4@stripped, 2007-11-29 13:08:22+02:00, gkodinov@stripped +5 -7
    Bug #32632: fix

diff -Nrup a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4
--- a/config/ac-macros/misc.m4	2007-10-19 02:33:37 +03:00
+++ b/config/ac-macros/misc.m4	2007-11-29 13:08:22 +02:00
@@ -125,8 +125,10 @@ fi
 ])
 
 
-AC_DEFUN([MYSQL_PTHREAD_YIELD],
-[AC_CACHE_CHECK([if pthread_yield takes zero arguments], ac_cv_pthread_yield_zero_arg,
+AC_DEFUN([MYSQL_PTHREAD_YIELD],[
+# Some OSes like Mac OS X have that as a replacement for pthread_yield()
+AC_CHECK_FUNCS(pthread_yield_np, AC_DEFINE([HAVE_PTHREAD_YIELD_NP],[],[Define if you have
pthread_yield_np]))
+AC_CACHE_CHECK([if pthread_yield takes zero arguments], ac_cv_pthread_yield_zero_arg,
 [AC_TRY_LINK([#define _GNU_SOURCE
 #include <pthread.h>
 #ifdef __cplusplus
@@ -141,8 +143,7 @@ then
   AC_DEFINE([HAVE_PTHREAD_YIELD_ZERO_ARG], [1],
             [pthread_yield that doesn't take any arguments])
 fi
-]
-[AC_CACHE_CHECK([if pthread_yield takes 1 argument], ac_cv_pthread_yield_one_arg,
+AC_CACHE_CHECK([if pthread_yield takes 1 argument], ac_cv_pthread_yield_one_arg,
 [AC_TRY_LINK([#define _GNU_SOURCE
 #include <pthread.h>
 #ifdef __cplusplus
@@ -159,9 +160,6 @@ then
 fi
 ]
 )
-
-# Some OSes like Mac OS X have that as a replacement for pthread_yield()
-AC_CHECK_FUNC(pthread_yield_np)
 
 #---END: