bk commit into 5.1 tree (msvensson:1.2200)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2200 06/03/19 20:03:35 msvensson@shellback.(none) +1 -0
  Use the "default variables" when printing the default values in the help text

  mysql-test/mysql-test-run.pl
    1.89 06/03/19 20:03:28 msvensson@shellback.(none) +2 -2
    Use the "default variables" when printing the default values in the help text

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysqltestrun_pl/my51-mysqltestrun_pl

--- 1.88/mysql-test/mysql-test-run.pl	2006-03-14 11:24:57 +01:00
+++ 1.89/mysql-test/mysql-test-run.pl	2006-03-19 20:03:28 +01:00
@@ -3409,8 +3409,8 @@
   help                  Get this help text
   unified-diff | udiff  When presenting differences, use unified diff
 
-  testcase-timeout=MINUTES Max test case run time (default 5)
-  suite-timeout=MINUTES    Max test suite run time (default 120)
+  testcase-timeout=MINUTES Max test case run time (default $default_testcase_timeout)
+  suite-timeout=MINUTES    Max test suite run time (default $default_suite_timeout)
 
 Deprecated options
   with-openssl          Deprecated option for ssl