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;