diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2010-06-24 13:02:50 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2010-06-24 13:02:50 +0200 |
| commit | 1e37ae0ea251f9c889bbb3b81fa06dbef0f474cd (patch) | |
| tree | 31f3e0a5fdb9771db60afe2034cb11e9a3e470c9 | |
| parent | f84c866c5c5983980ef6d19ce3340b1c55baaeb3 (diff) | |
| parent | 33173fbe827ed435066a3253a87866a0994503e4 (diff) | |
| download | mariadb-git-1e37ae0ea251f9c889bbb3b81fa06dbef0f474cd.tar.gz | |
Automerge the bug fix 54739 into the 5.5.5-m3 release clone.
| -rw-r--r-- | cmake/os/FreeBSD.cmake | 3 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/cmake/os/FreeBSD.cmake b/cmake/os/FreeBSD.cmake index be7af778e93..e09592942c1 100644 --- a/cmake/os/FreeBSD.cmake +++ b/cmake/os/FreeBSD.cmake @@ -20,4 +20,5 @@ # #Legacy option, maybe not needed anymore , taken as is from autotools build # ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000) -ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH) +# The below was used for really old versions of FreeBSD, roughly: before 5.1.9 +# ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH) diff --git a/configure.in b/configure.in index 5de43fc7951..ad0b3f80bce 100644 --- a/configure.in +++ b/configure.in @@ -1301,9 +1301,7 @@ case $SYSTEM_TYPE in if test "$OSVERSION" -gt "600000" then # Post user-level threads, MYSQLD_NET_RETRY_COUNT is not needed any more - AC_MSG_WARN([Adding fix for broken realpath]) - CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH" - CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_REALPATH" + : elif test "$OSVERSION" -gt "480100" && \ test "$OSVERSION" -lt "500000" || \ test "$OSVERSION" -gt "500109" |