List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:June 24 2010 11:04am
Subject:bzr push into mysql-trunk branch (joerg:3073 to 3074)
View as plain text  
 3074 Joerg Bruehe	2010-06-24 [merge]
      Automerge the bug fix 54739 into the 5.5.5-m3 release clone.

    modified:
      cmake/os/FreeBSD.cmake
      configure.in
 3073 Jonathan Perkin	2010-06-23
      Remove storage/ndb from dist sources.

    modified:
      cmake/cpack_source_ignore_files.cmake
      cmake/make_dist.cmake.in
=== modified file 'cmake/os/FreeBSD.cmake'
--- a/cmake/os/FreeBSD.cmake	2010-06-18 15:04:15 +0000
+++ b/cmake/os/FreeBSD.cmake	2010-06-23 14:19:19 +0000
@@ -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)

=== modified file 'configure.in'
--- a/configure.in	2010-06-18 15:04:15 +0000
+++ b/configure.in	2010-06-23 14:19:19 +0000
@@ -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"


Attachment: [text/bzr-bundle] bzr/joerg@mysql.com-20100624110250-of12em01noufl2qp.bundle
Thread
bzr push into mysql-trunk branch (joerg:3073 to 3074)Joerg Bruehe24 Jun