summaryrefslogtreecommitdiff
path: root/mysql-test/include/restart_mysqld.inc
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2010-11-26 13:59:39 +0100
committerBjorn Munch <bjorn.munch@oracle.com>2010-11-26 13:59:39 +0100
commit067710eba1e3c958fb64fe569fae027afc65fd90 (patch)
tree7862232e1583a2afa26e2f2e9667ca6b02e14607 /mysql-test/include/restart_mysqld.inc
parentf6c89f46cad6c87059e74177a3c92964f5ea4c6b (diff)
downloadmariadb-git-067710eba1e3c958fb64fe569fae027afc65fd90.tar.gz
Bug #58515 Tests: use use exec echo, not write_file to write mysqld.1.expect
Fixed as suggested in the .inc file and two tests Could not reproduce problem, but tested tests on Windows
Diffstat (limited to 'mysql-test/include/restart_mysqld.inc')
-rw-r--r--mysql-test/include/restart_mysqld.inc8
1 files changed, 2 insertions, 6 deletions
diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc
index 0f363ff1ee3..d92115f0a61 100644
--- a/mysql-test/include/restart_mysqld.inc
+++ b/mysql-test/include/restart_mysqld.inc
@@ -1,18 +1,14 @@
# Write file to make mysql-test-run.pl expect the "crash", but don't start
# it until it's told to
---write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-wait
-EOF
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
# Send shutdown to the connected server and give
# it 10 seconds to die before zapping it
shutdown_server 10;
# Write file to make mysql-test-run.pl start up the server again
---append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-restart
-EOF
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
# Turn on reconnect
--enable_reconnect