diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-04-29 12:03:54 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-04-29 12:03:54 +0200 |
| commit | 56d485e2b5d4bbc6ab20eb8e82197e9a557bb327 (patch) | |
| tree | bdf1c5349177381f302a1a028348ad7bc997c273 /mysql-test/include | |
| parent | 2d33547475ced9604d26c1e41298a87dfd44d015 (diff) | |
| parent | 59830e1ab8d5e60442b5d15729c8ef06132fc827 (diff) | |
| download | mariadb-git-56d485e2b5d4bbc6ab20eb8e82197e9a557bb327.tar.gz | |
Merge 10.0-base -> 10.0
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/restart_mysqld.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc index 7cb9c7994d8..49f6dfd5364 100644 --- a/mysql-test/include/restart_mysqld.inc +++ b/mysql-test/include/restart_mysqld.inc @@ -14,8 +14,8 @@ if ($rpl_inited) --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; +# it 60 seconds to die before zapping it +shutdown_server 60; # Write file to make mysql-test-run.pl start up the server again --exec echo "restart" > $_expect_file_name |