summaryrefslogtreecommitdiff
path: root/mysql-test/suite/rpl/t
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2012-03-16 17:47:31 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2012-03-16 17:47:31 +0100
commitc5e1fb6720fd12ec89ead4a7344e7cf2a96578e8 (patch)
tree4925841547a70fe23287a331c691528656c43b26 /mysql-test/suite/rpl/t
parentd110e0377dda1bb9f5a5c36745d3a6feb8e8a1d4 (diff)
downloadmariadb-git-c5e1fb6720fd12ec89ead4a7344e7cf2a96578e8.tar.gz
Fix several buildot errors on Windows
- do not attempt loading federatedx dynamically - does not work on Windows embedded - race condition in rpl_start_stop_slave - fix exclusion rule to catch warning in partition test
Diffstat (limited to 'mysql-test/suite/rpl/t')
-rw-r--r--mysql-test/suite/rpl/t/rpl_start_stop_slave.test3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_start_stop_slave.test b/mysql-test/suite/rpl/t/rpl_start_stop_slave.test
index 69d39a066b1..ffe346d9731 100644
--- a/mysql-test/suite/rpl/t/rpl_start_stop_slave.test
+++ b/mysql-test/suite/rpl/t/rpl_start_stop_slave.test
@@ -40,5 +40,8 @@ if(`select TIMESTAMPDIFF(SECOND,@time_after_kill, @time_before_kill) > 60`)
}
--echo [Killing of the slave IO thread was successful]
+--disable_warnings
+START SLAVE IO_THREAD;
+--enable_warnings
# End of test
--source include/rpl_end.inc