diff options
| author | unknown <joerg@trift2.> | 2007-01-11 20:20:43 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-01-11 20:20:43 +0100 |
| commit | 98cd24b32bdcc4d806920f80513f002805c6fb19 (patch) | |
| tree | 588b32f909274cb710a572031d741d9e5c6469df | |
| parent | 32c535e2d9fbb42e5fbe6d0b6255ec7f620a7932 (diff) | |
| parent | c11c3b08b8354836a5b1073b122f68ef0dc117f6 (diff) | |
| download | mariadb-git-98cd24b32bdcc4d806920f80513f002805c6fb19.tar.gz | |
Merge trift2.:/MySQL/M50/tmp1-5.0
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
| -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 53cf94e08b7..60c41689057 100644 --- a/configure.in +++ b/configure.in @@ -964,7 +964,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 |