diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-05-15 16:28:12 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-05-15 16:28:12 +0300 |
| commit | 0fa7729954c1be9ad20f1a39fc89d3e485a4d9eb (patch) | |
| tree | 036dfe7283b705920aafe0a707c125cd7886f098 /configure.cmake | |
| parent | 19cb1c4748eab1f658373ad1b3893843ad46e749 (diff) | |
| download | mariadb-git-0fa7729954c1be9ad20f1a39fc89d3e485a4d9eb.tar.gz | |
- Solaris fixes:
- Fixed that wait_timeout_func and wait_timeout tests works on solaris
- We have to compile without NO_ALARM on Solaris as Solaris doesn't support timeouts on sockets with setsockopt(.. SO_RCVTIMEO).
- Fixed that compile-solaris-amd64-debug works (before that we got a wrong ELF class: ELFCLASS64 on linkage)
- Fixed some compiler warnings
- Fixed some failing tests
BUILD/compile-solaris-amd64-debug:
Fixed that compile-solaris-amd64-debug works (before that we got a wrong ELF class: ELFCLASS64 on linkage)
configure.cmake:
We have to compile without NO_ALARM on Solaris as Solaris doesn't support timeouts on sockets with setsockopt(.. SO_RCVTIMEO)
mysql-test/suite/parts/t/partition_basic_innodb.test:
Mark test as big test (as otherwise we get timeout on our opensolaris machine in buildbot)
mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test:
Remove warning
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.cmake b/configure.cmake index 05e19509a78..db2779a2bf9 100644 --- a/configure.cmake +++ b/configure.cmake @@ -959,12 +959,15 @@ CHECK_CXX_SOURCE_COMPILES(" # they are silently ignored. For those OS's we will not attempt # to use SO_SNDTIMEO and SO_RCVTIMEO even if it is said to work. # See Bug#29093 for the problem with SO_SND/RCVTIMEO on HP/UX. +# Solaris11 has a similar problem # To use alarm is simple, simply avoid setting anything. IF(WIN32) SET(HAVE_SOCKET_TIMEOUT 1) ELSEIF(CMAKE_SYSTEM MATCHES "HP-UX") SET(HAVE_SOCKET_TIMEOUT 0) +ELSEIF(CMAKE_SYSTEM_NAME MATCHES "SunOS") + SET(HAVE_SOCKET_TIMEOUT 0) ELSEIF(CMAKE_CROSSCOMPILING) SET(HAVE_SOCKET_TIMEOUT 0) ELSE() |