diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-10 20:37:22 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-10 20:37:22 +0400 |
| commit | c11c3b08b8354836a5b1073b122f68ef0dc117f6 (patch) | |
| tree | 935030de3a9ca569ef69577384f917f80c5d3d55 | |
| parent | 380ad35c20626a6a4a5f64d7b6039e80864efd7f (diff) | |
| parent | 4ffd49d31101a0832dcf54a353e1ba48b31690e8 (diff) | |
| download | mariadb-git-c11c3b08b8354836a5b1073b122f68ef0dc117f6.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/d2/hf/mr10/my50-mr10
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | support-files/MySQL-shared-compat.spec.sh | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 69a0f9b576e..99a9f3b74ea 100644 --- a/configure.in +++ b/configure.in @@ -1074,7 +1074,6 @@ case $SYSTEM_TYPE in ;; *darwin*) AC_DEFINE([DEFAULT_SKIP_THREAD_PRIORITY], [1], [default to skip thread priority]) - CPPFLAGS="-D" if test "$ac_cv_prog_gcc" = "yes" then FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT" diff --git a/support-files/MySQL-shared-compat.spec.sh b/support-files/MySQL-shared-compat.spec.sh index 37733141451..14a98616863 100644 --- a/support-files/MySQL-shared-compat.spec.sh +++ b/support-files/MySQL-shared-compat.spec.sh @@ -29,7 +29,7 @@ # Change this to match the version of the shared libs you want to include # %define version50 @MYSQL_NO_DASH_VERSION@ -%define version41 4.1.16 +%define version41 4.1.17 %define version40 4.0.26 %define version3 3.23.58 |