diff options
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/federated_server.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/rpl_flushlog_loop.test | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/t/federated_server.test b/mysql-test/t/federated_server.test index 20332f65bff..87b67720104 100644 --- a/mysql-test/t/federated_server.test +++ b/mysql-test/t/federated_server.test @@ -2,7 +2,8 @@ # if federated can utilise the servers table # should work with embedded server after mysqltest is fixed -- source include/not_embedded.inc -source include/federated.inc; +-- source include/federated.inc; +-- source include/big_test.inc connection slave; create database first_db; @@ -299,7 +300,7 @@ begin DECLARE i INT; DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET e = e + 1; SET i = sleep(5); - WHILE v < 20000 do + WHILE v < 10000 do CREATE SERVER s FOREIGN DATA WRAPPER mysql OPTIONS (USER 'Remote', HOST '192.168.1.106', DATABASE 'test'); diff --git a/mysql-test/t/rpl_flushlog_loop.test b/mysql-test/t/rpl_flushlog_loop.test index ded111d769f..471c45a1aa3 100644 --- a/mysql-test/t/rpl_flushlog_loop.test +++ b/mysql-test/t/rpl_flushlog_loop.test @@ -5,6 +5,9 @@ # # Start replication master -> slave # +# We have to sync with master, to ensure slave had time to start properly +# before we stop it. If not, we get errors about UNIX_TIMESTAMP() in the log. +sync_slave_with_master; connection slave; --disable_warnings stop slave; |