Automerge the bug fix 54739 into the 5.5.5-m3 release clone.

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)

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"