summaryrefslogtreecommitdiffstats
path: root/mysql-test/include/shutdown_mysqld.inc
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/include/shutdown_mysqld.inc')
-rw-r--r--mysql-test/include/shutdown_mysqld.inc9
1 files changed, 3 insertions, 6 deletions
diff --git a/mysql-test/include/shutdown_mysqld.inc b/mysql-test/include/shutdown_mysqld.inc
index fc297256..1684d819 100644
--- a/mysql-test/include/shutdown_mysqld.inc
+++ b/mysql-test/include/shutdown_mysqld.inc
@@ -24,18 +24,15 @@ if ($rpl_inited)
# Write file to make mysql-test-run.pl expect the "crash", but don't start it
--let $_expect_file_name= `select regexp_replace(@@tmpdir, '^.*/','')`
--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/$_expect_file_name.expect
---exec echo "wait" > $_expect_file_name
+--write_line wait $_expect_file_name
# Avoid warnings from connection threads that does not have time to exit
--disable_query_log
set @@global.log_warnings=0;
--enable_query_log
---let $server_shutdown_timeout= 60
-if ($VALGRIND_TEST)
-{
- --let $server_shutdown_timeout= 300
-}
+--source include/slow_environ.inc
+--let $server_shutdown_timeout= 60$_timeout_adjustment
if ($shutdown_timeout)
{