database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

- Solaris fixes:

Browse Source 
- 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
This commit is contained in:
Michael Widenius
2013-05-15 16:28:12 +03:00
parent 19cb1c4748
commit 0fa7729954
6 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BUILD/FINISH.sh
View File

@@ -42,8 +42,7 @@ path=`dirname $0`
if [ -z "$just_clean" ] if [ -z "$just_clean" ]
then then
commands="$commands commands="$commands
CC=\"$CC\" CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" \ CC=\"$CC\" CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" $configure"
$configure"
fi fi
if [ -z "$just_configure" -a -z "$just_clean" ] if [ -z "$just_configure" -a -z "$just_clean" ]

2
BUILD/compile-solaris-amd64-debug
View File

@@ -20,7 +20,7 @@ path=`dirname $0`
extra_flags="$amd64_cflags -D__sun -m64 -mtune=athlon64 $debug_cflags" extra_flags="$amd64_cflags -D__sun -m64 -mtune=athlon64 $debug_cflags"
extra_configs="$amd64_configs $debug_configs $max_configs --with-libevent" extra_configs="$amd64_configs $debug_configs $max_configs --with-libevent"
LDFLAGS="-lmtmalloc -R/usr/sfw/lib/64" LDFLAGS="-m64 -lmtmalloc -R/usr/sfw/lib/64"
export LDFLAGS export LDFLAGS
. "$path/FINISH.sh" . "$path/FINISH.sh"

3
configure.cmake
View File

@@ -959,12 +959,15 @@ CHECK_CXX_SOURCE_COMPILES("
# they are silently ignored. For those OS's we will not attempt # 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. # 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. # 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. # To use alarm is simple, simply avoid setting anything.
IF(WIN32) IF(WIN32)
SET(HAVE_SOCKET_TIMEOUT 1) SET(HAVE_SOCKET_TIMEOUT 1)
ELSEIF(CMAKE_SYSTEM MATCHES "HP-UX") ELSEIF(CMAKE_SYSTEM MATCHES "HP-UX")
SET(HAVE_SOCKET_TIMEOUT 0) SET(HAVE_SOCKET_TIMEOUT 0)
ELSEIF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
SET(HAVE_SOCKET_TIMEOUT 0)
ELSEIF(CMAKE_CROSSCOMPILING) ELSEIF(CMAKE_CROSSCOMPILING)
SET(HAVE_SOCKET_TIMEOUT 0) SET(HAVE_SOCKET_TIMEOUT 0)
ELSE() ELSE()

2
mysql-test/suite/parts/t/partition_basic_innodb.test
View File

@@ -22,7 +22,7 @@
# any of the variables. # any of the variables.
# #
--source include/long_test.inc --source include/big_test.inc
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# General not engine specific settings and requirements # General not engine specific settings and requirements

2
mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test
View File

@@ -67,7 +67,9 @@ stop slave;
reset slave; reset slave;
# Table was created from binlog, it may not be created if SQL thread is running # Table was created from binlog, it may not be created if SQL thread is running
# slowly and IO thread reaches incident before SQL thread applies it. # slowly and IO thread reaches incident before SQL thread applies it.
--disable_warnings
drop table if exists t; drop table if exists t;
--enable_warnings
reset master; reset master;
--echo End of the tests --echo End of the tests

2
support-files/compiler_warnings.supp
View File

@@ -47,6 +47,8 @@ btr/btr0cur\.c: null argument where non-null required: 1800-3000
btr/btr0btr\.c: null argument where non-null required: 2500-3000 btr/btr0btr\.c: null argument where non-null required: 2500-3000
ibuf/ibuf0ibuf.c: null argument where non-null required: 700-1000 ibuf/ibuf0ibuf.c: null argument where non-null required: 700-1000
fsp0fsp\.c: result of 32-bit shift implicitly converted to 64 bits fsp0fsp\.c: result of 32-bit shift implicitly converted to 64 bits
log/log0log\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer type
log/log0online\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer type
# #
# bdb is not critical to keep up to date # bdb is not critical to keep up to date