summaryrefslogtreecommitdiff
path: root/mysql-test/suite/rpl
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2013-05-15 16:28:12 +0300
committerMichael Widenius <monty@askmonty.org>2013-05-15 16:28:12 +0300
commit0fa7729954c1be9ad20f1a39fc89d3e485a4d9eb (patch)
tree036dfe7283b705920aafe0a707c125cd7886f098 /mysql-test/suite/rpl
parent19cb1c4748eab1f658373ad1b3893843ad46e749 (diff)
downloadmariadb-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 'mysql-test/suite/rpl')
-rw-r--r--mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test b/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test
index 86ee64b5e73..a97801f9ab0 100644
--- a/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test
+++ b/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test
@@ -67,7 +67,9 @@ stop slave;
reset slave;
# 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.
+--disable_warnings
drop table if exists t;
+--enable_warnings
reset master;
--echo End of the tests