summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authortsmith@quadxeon.mysql.com <>2007-03-07 06:54:35 +0100
committertsmith@quadxeon.mysql.com <>2007-03-07 06:54:35 +0100
commita15fe85de2130aa24e3d891c4a32ff7fc8bba807 (patch)
tree62e24f3fd3fa6f0d0f71638998ab4294d187c651 /mysql-test/mysql-test-run.pl
parentd57143aaac7c0009f8a401c6f093606f27ad803d (diff)
parent82c1c02379e4573a6699dec2f9c0180f81d6f166 (diff)
downloadmariadb-git-a15fe85de2130aa24e3d891c4a32ff7fc8bba807.tar.gz
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 9f1ab7a73d0..6b78bf7ad92 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3043,6 +3043,7 @@ language = $path_language
character-sets-dir = $path_charsetsdir
basedir = $path_my_basedir
server_id = $server_id
+shutdown-delay = 10
skip-stack-trace
skip-innodb
skip-ndbcluster