Merge bk@192.168.21.1:mysql-5.0

into  mysql.com:/d2/hf/mr10/my50-mr10
parents bcd4d84d 1768b21a
...@@ -1074,7 +1074,6 @@ case $SYSTEM_TYPE in ...@@ -1074,7 +1074,6 @@ case $SYSTEM_TYPE in
;; ;;
*darwin*) *darwin*)
AC_DEFINE([DEFAULT_SKIP_THREAD_PRIORITY], [1], [default to skip thread priority]) AC_DEFINE([DEFAULT_SKIP_THREAD_PRIORITY], [1], [default to skip thread priority])
CPPFLAGS="-D"
if test "$ac_cv_prog_gcc" = "yes" if test "$ac_cv_prog_gcc" = "yes"
then then
FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT" FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT"
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
# Change this to match the version of the shared libs you want to include # Change this to match the version of the shared libs you want to include
# #
%define version50 @MYSQL_NO_DASH_VERSION@ %define version50 @MYSQL_NO_DASH_VERSION@
%define version41 4.1.16 %define version41 4.1.17
%define version40 4.0.26 %define version40 4.0.26
%define version3 3.23.58 %define version3 3.23.58
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment