automerge: merged bundle from bug report into latest

mysql-trunk-bugfixing (bug 52341).
This commit is contained in:
Luis Soares 2010-04-16 00:58:05 +01:00
commit 24b9ff294c

View File

@ -913,6 +913,7 @@ ENDIF()
SET(NO_ALARM "${HAVE_SOCKET_TIMEOUT}" CACHE BOOL
"No need to use alarm to implement socket timeout")
SET(SIGNAL_WITH_VIO_CLOSE "${HAVE_SOCKET_TIMEOUT}")
MARK_AS_ADVANCED(NO_ALARM)