summaryrefslogtreecommitdiff
path: root/mysql-test/t/federated_server.test
diff options
context:
space:
mode:
authorunknown <monty@mysql.com/narttu.mysql.fi>2007-04-17 14:41:16 +0300
committerunknown <monty@mysql.com/narttu.mysql.fi>2007-04-17 14:41:16 +0300
commit763f105dff3aada394cd7c6b94b3e5867f79c1b9 (patch)
treea41e99e7343f5bdd8970e3a1f9bfd6d769a20bc3 /mysql-test/t/federated_server.test
parent48892844a9eab3c69143e1ae45690de3e947b650 (diff)
downloadmariadb-git-763f105dff3aada394cd7c6b94b3e5867f79c1b9.tar.gz
Fixed federated and some replication tests to not stop slave until it's up and running.
(Removes some warnings about UNIX_TIMESTAMP from the slave.err logs) Marked federated_server as a '--big-test' Change error in net_clear to 'Note', as it interfered with mysql-test-run. client/mysqltest.c: More DBUG messages Adding missing DBUG_RETURN mysql-test/extra/rpl_tests/rpl_max_relay_size.test: Added missing sync_slave_with_master mysql-test/extra/rpl_tests/rpl_relayrotate.test: Added missing sync_slave_with_master mysql-test/include/federated.inc: Don't do stop slave before the slave has started properly (Removes some warnings about UNIX_TIMESTAMP from the slave.err logs) mysql-test/include/federated_cleanup.inc: Trivial cleanup mysql-test/t/federated_server.test: Don't run this unless under --big-test Made test-loop smaller. (We will find out errors in code over time, as the test is run under a lot of difference machines which will compensate for the smaller loop) mysql-test/t/rpl_flushlog_loop.test: Added missing sync_slave_with_master sql/net_serv.cc: Change error to Note (low level warning), as it interfered with mysql-test-run. This is probably fine as we in some context on sever shutdown can get information about connection shutdown on the connection while we are doing a query at the same time. Still, in normal context one should get this, so it's good to have it in the log as it enables one to find errors easier. sql/slave.cc: Added reason to why things failed to error message
Diffstat (limited to 'mysql-test/t/federated_server.test')
-rw-r--r--mysql-test/t/federated_server.test5
1 files changed, 3 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');