From 654547b5b4b21aec719a84149595464364c96eea Mon Sep 17 00:00:00 2001 From: Monty Date: Fri, 27 Nov 2015 02:06:58 +0200 Subject: Fixed problems found by buildbot: - Better error from check_slave_param - Better error message from TokuDB if it can't be compiled. - Marked rpl_mixed_drop_create_temp_table and rpl_stm_drop_create_temp_table as big tests to stop timeout failures on power8 - Added sync_slave_with_master to semisync_future-7591 to ensure that slave is up to date with master before calling rpl_end. - Disabled compiler warnings from connect and mroonga and on MacOSX. Mroonga: - Fixed bug when testing if file is a normal file that can be deleted - Marked a lot of date and datetime test to not run on macosx. This is because mktime() can't handle negative years and this restricts mroonga so that it can only store dates after the year 1900. --- mysql-test/suite/rpl/t/rpl_mixed_drop_create_temp_table.test | 1 + mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test | 1 + mysql-test/suite/rpl/t/semisync_future-7591.test | 2 ++ 3 files changed, 4 insertions(+) (limited to 'mysql-test/suite/rpl') diff --git a/mysql-test/suite/rpl/t/rpl_mixed_drop_create_temp_table.test b/mysql-test/suite/rpl/t/rpl_mixed_drop_create_temp_table.test index e270d81a5e5..d3412c3cd52 100644 --- a/mysql-test/suite/rpl/t/rpl_mixed_drop_create_temp_table.test +++ b/mysql-test/suite/rpl/t/rpl_mixed_drop_create_temp_table.test @@ -3,6 +3,7 @@ # tables. Specifically when drop temporary tables and create temporary tables # are used. ################################################################################### +--source include/big_test.inc --source include/have_binlog_format_mixed.inc --source include/have_innodb.inc --source include/master-slave.inc diff --git a/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test b/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test index 6e3dabf6e32..7770fc77748 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test +++ b/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test @@ -3,6 +3,7 @@ # tables. Specifically when drop temporary tables and create temporary tables # are used. ################################################################################### +--source include/big_test.inc --source include/have_binlog_format_statement.inc --source include/master-slave.inc --source include/have_innodb.inc diff --git a/mysql-test/suite/rpl/t/semisync_future-7591.test b/mysql-test/suite/rpl/t/semisync_future-7591.test index 772a36b5632..daf3d2f8571 100644 --- a/mysql-test/suite/rpl/t/semisync_future-7591.test +++ b/mysql-test/suite/rpl/t/semisync_future-7591.test @@ -27,5 +27,7 @@ reset slave; set global rpl_semi_sync_slave_enabled = OFF; --connection master drop table t1; +--sync_slave_with_master +--connection master set global rpl_semi_sync_master_enabled = OFF; --source include/rpl_end.inc -- cgit v1.2.1