Commit 7ca7b55f authored by Luis Soares's avatar Luis Soares

automerge: merged bundle from bug report into latest

mysql-trunk-bugfixing (bug 52341).
parents 1bbd8984 6e636803
...@@ -913,6 +913,7 @@ ENDIF() ...@@ -913,6 +913,7 @@ ENDIF()
SET(NO_ALARM "${HAVE_SOCKET_TIMEOUT}" CACHE BOOL SET(NO_ALARM "${HAVE_SOCKET_TIMEOUT}" CACHE BOOL
"No need to use alarm to implement socket timeout") "No need to use alarm to implement socket timeout")
SET(SIGNAL_WITH_VIO_CLOSE "${HAVE_SOCKET_TIMEOUT}")
MARK_AS_ADVANCED(NO_ALARM) MARK_AS_ADVANCED(NO_ALARM)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment