|
|
@@ -1,365 +0,0 @@
|
|
|
---- mysql-5.1.48.orig/configure 2010-06-03 17:54:47.000000000 +0200
|
|
|
-+++ mysql-5.1.48/configure 2011-01-15 12:58:47.000000000 +0100
|
|
|
-@@ -19764,15 +19764,6 @@ fi
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
--# Enable the abi_check rule only if gcc is available
|
|
|
--
|
|
|
--if test "$GCC" != "yes" || expr "$CC" : ".*icc.*"
|
|
|
--then
|
|
|
-- ABI_CHECK=""
|
|
|
--else
|
|
|
-- ABI_CHECK="abi_check"
|
|
|
--fi
|
|
|
--
|
|
|
-
|
|
|
-
|
|
|
- # Look for PS usage. We use double dollar-signs in FIND_PROC because this
|
|
|
-@@ -19825,45 +19816,7 @@ fi
|
|
|
- $as_echo_n "checking \"how to check if pid exists\"... " >&6; }
|
|
|
- PS=$ac_cv_path_PS
|
|
|
- # Linux style
|
|
|
--if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
|
|
|
--then
|
|
|
-- FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
|
|
|
--# Solaris
|
|
|
--elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
|
|
|
--then
|
|
|
-- FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
|
|
|
--# BSD style
|
|
|
--elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null
|
|
|
--then
|
|
|
-- FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
|
|
|
--# SysV style
|
|
|
--elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null
|
|
|
--then
|
|
|
-- FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
|
|
|
--# Do anybody use this?
|
|
|
--elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null
|
|
|
--then
|
|
|
-- FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
|
|
|
--else
|
|
|
-- case $SYSTEM_TYPE in
|
|
|
-- *freebsd*|*dragonfly*)
|
|
|
-- FIND_PROC="$PS p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
|
|
|
-- ;;
|
|
|
-- *darwin*)
|
|
|
-- FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
|
|
|
-- ;;
|
|
|
-- *cygwin*)
|
|
|
-- FIND_PROC="$PS -e | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
|
|
|
-- ;;
|
|
|
-- *netware*)
|
|
|
-- FIND_PROC=
|
|
|
-- ;;
|
|
|
-- *)
|
|
|
-- { { $as_echo "$as_me:$LINENO: error: Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." >&5
|
|
|
--$as_echo "$as_me: error: Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." >&2;}
|
|
|
-- { (exit 1); exit 1; }; }
|
|
|
-- esac
|
|
|
--fi
|
|
|
-+FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
|
|
|
-
|
|
|
- { $as_echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
|
|
|
- $as_echo "\"$FIND_PROC\"" >&6; }
|
|
|
-@@ -48273,197 +48226,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; }
|
|
|
-@@ -48581,101 +48351,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()
|
Waldemar Brodkorb