summaryrefslogtreecommitdiff
path: root/mysql-test/suite/large_tests
diff options
context:
space:
mode:
authorSven Sandberg <sven.sandberg@oracle.com>2010-12-19 18:15:12 +0100
committerSven Sandberg <sven.sandberg@oracle.com>2010-12-19 18:15:12 +0100
commit1bd213aec31f4c2de242a7fe1baf2373e79bda7d (patch)
tree91a12675003778cd8ccbccea5ce47ee09fc46efc /mysql-test/suite/large_tests
parenta3cc81fa70e71dd9a40be3c5477eb7a6e8ec4974 (diff)
parent8b27f9a05e2f49191b57b8717a31753573981fe7 (diff)
downloadmariadb-git-1bd213aec31f4c2de242a7fe1baf2373e79bda7d.tar.gz
Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.
Diffstat (limited to 'mysql-test/suite/large_tests')
-rw-r--r--mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test b/mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test
index 9a2cdc3b596..bfe7f712a20 100644
--- a/mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test
+++ b/mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test
@@ -79,3 +79,4 @@ set @@global.log_output = @save_log_output;
connection slave;
set @@global.slave_net_timeout = @save_slave_net_timeout;
+--source include/rpl_end.inc