diff options
author | Elena Stepanova <elenst@montyprogram.com> | 2015-08-24 01:37:21 +0300 |
---|---|---|
committer | Elena Stepanova <elenst@montyprogram.com> | 2015-08-24 01:37:21 +0300 |
commit | aef8bfdc826d7466dd482d38522de925ad6b4217 (patch) | |
tree | db99b16208ea3fe4523f55dfae42720975e6d712 /mysql-test | |
parent | 9b475ee3c1855c23fc716ba83a261c238d9b6f83 (diff) | |
download | mariadb-git-aef8bfdc826d7466dd482d38522de925ad6b4217.tar.gz |
MDEV-8670 main.mdev-504 fails on Windows (in buildbot and outside)
Test failed because it hit net_write_timeout. It might happen in
different circumstances, and that's not what the testcase tests,
so the timeout is now set to a bigger value.
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/mdev-504.result | 2 | ||||
-rw-r--r-- | mysql-test/t/mdev-504.test | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/r/mdev-504.result b/mysql-test/r/mdev-504.result index e178127cf2a..4d93e77c6e8 100644 --- a/mysql-test/r/mdev-504.result +++ b/mysql-test/r/mdev-504.result @@ -1,3 +1,4 @@ +SET GLOBAL net_write_timeout = 900; CREATE TABLE A ( pk INTEGER AUTO_INCREMENT PRIMARY KEY, fdate DATE @@ -19,3 +20,4 @@ DROP TABLE A; DROP PROCEDURE p_analyze; DROP FUNCTION rnd3; SET GLOBAL use_stat_tables = DEFAULT; +SET GLOBAL net_write_timeout = DEFAULT; diff --git a/mysql-test/t/mdev-504.test b/mysql-test/t/mdev-504.test index bc38e99067a..fb5c7666d33 100644 --- a/mysql-test/t/mdev-504.test +++ b/mysql-test/t/mdev-504.test @@ -1,5 +1,7 @@ --disable_ps_protocol +SET GLOBAL net_write_timeout = 900; + CREATE TABLE A ( pk INTEGER AUTO_INCREMENT PRIMARY KEY, fdate DATE @@ -74,4 +76,4 @@ DROP TABLE A; DROP PROCEDURE p_analyze; DROP FUNCTION rnd3; SET GLOBAL use_stat_tables = DEFAULT; - +SET GLOBAL net_write_timeout = DEFAULT; |