bk commit into 5.0 tree (msvensson:1.2279)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 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@stripped, 2006-09-20 15:41:46+02:00, msvensson@shellback.(none) +1 -0
  Fix problem with testcase timeouts not working. The timeout value was always multiplied with 10
  since the $opt_valgrind variable was initialised to 0, thus being "defined"

  mysql-test/mysql-test-run.pl@stripped, 2006-09-20 15:41:43+02:00, msvensson@shellback.(none) +2 -2
    Increase the timeout values if $opt_valgrind are greater than 0. By default $opt_valgrind is set to 0.

# 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/work/my50-work

--- 1.117/mysql-test/mysql-test-run.pl	2006-09-20 15:41:51 +02:00
+++ 1.118/mysql-test/mysql-test-run.pl	2006-09-20 15:41:51 +02:00
@@ -848,13 +848,13 @@
   if ( ! $opt_testcase_timeout )
   {
     $opt_testcase_timeout= $default_testcase_timeout;
-    $opt_testcase_timeout*= 10 if defined $opt_valgrind;
+    $opt_testcase_timeout*= 10 if $opt_valgrind;
   }
 
   if ( ! $opt_suite_timeout )
   {
     $opt_suite_timeout= $default_suite_timeout;
-    $opt_suite_timeout*= 6 if defined $opt_valgrind;
+    $opt_suite_timeout*= 6 if $opt_valgrind;
   }
 
   # Increase times to wait for executables to start if using valgrind