diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-17 13:06:49 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-17 13:06:49 +0200 |
| commit | 2269988b7570bd0a78a92ee3778590cde5b1b90f (patch) | |
| tree | 500d3653afddd19e0dc1dd73c4d76426295665b9 /mysql-test/include/restart_mysqld.inc | |
| parent | 122cde4c38ed821a262c58462a8a85663288344e (diff) | |
| parent | 4c0c5525825714ccd91c3c07e303c068bcc12ce5 (diff) | |
| download | mariadb-git-2269988b7570bd0a78a92ee3778590cde5b1b90f.tar.gz | |
merge
Diffstat (limited to 'mysql-test/include/restart_mysqld.inc')
| -rw-r--r-- | mysql-test/include/restart_mysqld.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc index d92115f0a61..f750385e300 100644 --- a/mysql-test/include/restart_mysqld.inc +++ b/mysql-test/include/restart_mysqld.inc @@ -1,14 +1,16 @@ # Write file to make mysql-test-run.pl expect the "crash", but don't start # it until it's told to ---exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +--let $_server_id= `SELECT @@server_id` +--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect +--exec echo "wait" > $_expect_file_name # 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 ---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +--exec echo "restart" > $_expect_file_name # Turn on reconnect --enable_reconnect |