| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302 | --- mysql-5.1.41.orig/configure	2009-11-04 19:37:28.000000000 +0100+++ mysql-5.1.41/configure	2009-12-25 12:18:01.000000000 +0100@@ -46976,197 +46976,14 @@ $as_echo "$as_me: error: unknown endiann   esac  -  { $as_echo "$as_me:$LINENO: checking whether GCC atomic builtins are available" >&5-$as_echo_n "checking whether GCC atomic builtins are available... " >&6; }-  # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not-  if test "$cross_compiling" = yes; then-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling-See \`config.log' for more details." >&5-$as_echo "$as_me: error: cannot run test program while cross compiling-See \`config.log' for more details." >&2;}-   { (exit 1); exit 1; }; }; }-else-  cat >conftest.$ac_ext <<_ACEOF-/* confdefs.h.  */-_ACEOF-cat confdefs.h >>conftest.$ac_ext-cat >>conftest.$ac_ext <<_ACEOF-/* end confdefs.h.  */--      int main()-      {-	long	x;-	long	y;-	long	res;-	char	c;--	x = 10;-	y = 123;-	res = __sync_bool_compare_and_swap(&x, x, y);-	if (!res || x != y) {-          return(1);-        }--	x = 10;-	y = 123;-	res = __sync_bool_compare_and_swap(&x, x + 1, y);-	if (res || x != 10) {-          return(1);-        }--	x = 10;-	y = 123;-	res = __sync_add_and_fetch(&x, y);-	if (res != 123 + 10 || x != 123 + 10) {-	  return(1);-	}--	c = 10;-	res = __sync_lock_test_and_set(&c, 123);-	if (res != 10 || c != 123) {-	  return(1);-	}--	return(0);-      }--_ACEOF-rm -f conftest$ac_exeext-if { (ac_try="$ac_link"-case "(($ac_try" in-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;-  *) ac_try_echo=$ac_try;;-esac-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""-$as_echo "$ac_try_echo") >&5-  (eval "$ac_link") 2>&5-  ac_status=$?-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'-  { (case "(($ac_try" in-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;-  *) ac_try_echo=$ac_try;;-esac-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""-$as_echo "$ac_try_echo") >&5-  (eval "$ac_try") 2>&5-  ac_status=$?-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5-  (exit $ac_status); }; }; then-- cat >>confdefs.h <<\_ACEOF #define HAVE_IB_GCC_ATOMIC_BUILTINS 1 _ACEOF -      { $as_echo "$as_me:$LINENO: result: yes" >&5-$as_echo "yes" >&6; }--else-  $as_echo "$as_me: program exited with status $ac_status" >&5-$as_echo "$as_me: failed program was:" >&5-sed 's/^/| /' conftest.$ac_ext >&5--( exit $ac_status )--      { $as_echo "$as_me:$LINENO: result: no" >&5-$as_echo "no" >&6; }---fi-rm -rf conftest.dSYM-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext-fi----  { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by GCC atomic builtins" >&5-$as_echo_n "checking whether pthread_t can be used by GCC atomic builtins... " >&6; }-  # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not-  if test "$cross_compiling" = yes; then-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling-See \`config.log' for more details." >&5-$as_echo "$as_me: error: cannot run test program while cross compiling-See \`config.log' for more details." >&2;}-   { (exit 1); exit 1; }; }; }-else-  cat >conftest.$ac_ext <<_ACEOF-/* confdefs.h.  */-_ACEOF-cat confdefs.h >>conftest.$ac_ext-cat >>conftest.$ac_ext <<_ACEOF-/* end confdefs.h.  */--      #include <pthread.h>-      #include <string.h>--      int main(int argc, char** argv) {-        pthread_t       x1;-        pthread_t       x2;-        pthread_t       x3;--	memset(&x1, 0x0, sizeof(x1));-	memset(&x2, 0x0, sizeof(x2));-	memset(&x3, 0x0, sizeof(x3));--        __sync_bool_compare_and_swap(&x1, x2, x3);--        return(0);-      }--_ACEOF-rm -f conftest$ac_exeext-if { (ac_try="$ac_link"-case "(($ac_try" in-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;-  *) ac_try_echo=$ac_try;;-esac-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""-$as_echo "$ac_try_echo") >&5-  (eval "$ac_link") 2>&5-  ac_status=$?-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'-  { (case "(($ac_try" in-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;-  *) ac_try_echo=$ac_try;;-esac-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""-$as_echo "$ac_try_echo") >&5-  (eval "$ac_try") 2>&5-  ac_status=$?-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5-  (exit $ac_status); }; }; then-- cat >>confdefs.h <<\_ACEOF #define HAVE_IB_ATOMIC_PTHREAD_T_GCC 1 _ACEOF -      { $as_echo "$as_me:$LINENO: result: yes" >&5-$as_echo "yes" >&6; }--else-  $as_echo "$as_me: program exited with status $ac_status" >&5-$as_echo "$as_me: failed program was:" >&5-sed 's/^/| /' conftest.$ac_ext >&5--( exit $ac_status )--      { $as_echo "$as_me:$LINENO: result: no" >&5-$as_echo "no" >&6; }---fi-rm -rf conftest.dSYM-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext-fi--    { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5 $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; }@@ -47284,101 +47101,6 @@ fi done  -  { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by Solaris libc atomic functions" >&5-$as_echo_n "checking whether pthread_t can be used by Solaris libc atomic functions... " >&6; }-  # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not-  if test "$cross_compiling" = yes; then-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling-See \`config.log' for more details." >&5-$as_echo "$as_me: error: cannot run test program while cross compiling-See \`config.log' for more details." >&2;}-   { (exit 1); exit 1; }; }; }-else-  cat >conftest.$ac_ext <<_ACEOF-/* confdefs.h.  */-_ACEOF-cat confdefs.h >>conftest.$ac_ext-cat >>conftest.$ac_ext <<_ACEOF-/* end confdefs.h.  */--      #include <pthread.h>-      #include <string.h>--      int main(int argc, char** argv) {-        pthread_t       x1;-        pthread_t       x2;-        pthread_t       x3;--        memset(&x1, 0x0, sizeof(x1));-        memset(&x2, 0x0, sizeof(x2));-        memset(&x3, 0x0, sizeof(x3));--        if (sizeof(pthread_t) == 4) {--          atomic_cas_32(&x1, x2, x3);--        } else if (sizeof(pthread_t) == 8) {--          atomic_cas_64(&x1, x2, x3);--        } else {--          return(1);-        }--	return(0);-      }--_ACEOF-rm -f conftest$ac_exeext-if { (ac_try="$ac_link"-case "(($ac_try" in-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;-  *) ac_try_echo=$ac_try;;-esac-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""-$as_echo "$ac_try_echo") >&5-  (eval "$ac_link") 2>&5-  ac_status=$?-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'-  { (case "(($ac_try" in-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;-  *) ac_try_echo=$ac_try;;-esac-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""-$as_echo "$ac_try_echo") >&5-  (eval "$ac_try") 2>&5-  ac_status=$?-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5-  (exit $ac_status); }; }; then---cat >>confdefs.h <<\_ACEOF-#define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS 1-_ACEOF--      { $as_echo "$as_me:$LINENO: result: yes" >&5-$as_echo "yes" >&6; }--else-  $as_echo "$as_me: program exited with status $ac_status" >&5-$as_echo "$as_me: failed program was:" >&5-sed 's/^/| /' conftest.$ac_ext >&5--( exit $ac_status )--      { $as_echo "$as_me:$LINENO: result: no" >&5-$as_echo "no" >&6; }---fi-rm -rf conftest.dSYM-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext-fi-     # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
 |