From: Bjorn Munch
Date: January 22 2010 11:34am
Subject: bzr commit into mysql-5.0-bugteam branch (Bjorn.Munch:2841) Bug#49210
List-Archive: http://lists.mysql.com/commits/97853
X-Bug: 49210
Message-Id: <20100122113422.1895.qmail@khepri03>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0959518771=="

--===============0959518771==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/timenv-50/ based on revid:ramil@stripped

 2841 Bjorn Munch	2010-01-22
      Bug #49210 Enable MTR timeout configuration through environment variables
      Define env. vars for both timeout settings
      This patch is for 5.0 (mtr v1); it does not replace 
         the previous patch which is for 5.1 (mtr v2)

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-09-02 13:36:52 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-01-22 11:32:36 +0000
@@ -1077,13 +1077,15 @@ sub command_line_setup () {
 
   if ( ! $opt_testcase_timeout )
   {
-    $opt_testcase_timeout= $default_testcase_timeout;
+    $opt_testcase_timeout=
+      $ENV{MTR_TESTCASE_TIMEOUT} || $default_testcase_timeout;
     $opt_testcase_timeout*= 10 if $opt_valgrind;
   }
 
   if ( ! $opt_suite_timeout )
   {
-    $opt_suite_timeout= $default_suite_timeout;
+    $opt_suite_timeout=
+      $ENV{MTR_SUITE_TIMEOUT} || $default_suite_timeout;
     $opt_suite_timeout*= 6 if $opt_valgrind;
   }
 


--===============0959518771==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/timenv-50/
# testament_sha1: 61863b3c5769910f5a997854919efdf42c36e7c6
# timestamp: 2010-01-22 12:34:22 +0100
# base_revision_id: ramil@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWciLDWkAActfgFAQXWP//34j
nwC////+UARyeDQ22KQNNQlCJqNMEmNU3oyKPyBRoaHkymjxTQ00eoJRBD1QT1DYU9TIaANAB6gA
epoZBzRkxMAExGBGmBBiMEyYBGHNGTEwATEYEaYEGIwTJgEYJJBGjSaYKZqnkzVTzSn6aTKPKbSA
NA0bUPMKlFWOwX0p2CNRkGxTJWKk6zQ2fiCxQGldjvqS3g7VAigtuk8GoWsteqqnt5F0JFCiA99U
77h8NVoLGOlX0mpToxyWBZB0MDMX43JzZimXhI8jIbX9Syuajudk8ndr8sSutEaqpwJk1ims/LBR
HZkoICH8zdmdjCJslMGqgSxMH71FMktY3Dh5oop30oxYxg5otbAQykyB6emFmd0R6kdDEp/gvcEq
dg+C7YWkG1sTy10IK9aoRtnFUCZRYVh2RhXe81L1YVTrjAYgqpk6aC6rtlQOqP7Dery6WMk70Qsr
Ra46hSLb3nzFAV5qVRGwcM4MSgWt42dA9Se60YUBNvZwlLiaQrId2uZyUUzGhWjEUZRya2XbFGMY
nZZSbQ2eQqF1nETizXdDIgbuGa2sZU1OOuW6BgR/wkae43EzdkfTkVxcshPMXvTid79B12iK/aoh
MYqJHfoXqtZDhjAsfWW13QoGhSLGLEIFzuonRkPMSZdSUTkU8CBKZaSgzsKmK0QeTCPM9WPgqGF6
sPMU5K4uzYiKJWBfX4lfzc9i8rO2J7eCicoqFFVel7fi84nmXDz7zOPzOP/hbcISJndpZZlLyYL5
HQaC4YsTc6hO3Z74iiHYeZEOsWi9593eeJqn+nLvtuO8I0jlS0/G+J9Tcc0cQ3G/7XzwOwYY6uPk
d6LEmDufA3lWtDMU1HM4FRNgg7KrANyjg470QoMAkh4TcS0lRyLIYBMaMbiZxLpvGi5ltXVOSVi0
zxFUdpH5lNpG8eGp41uozu593uPa1/NMh20YTo4atWYXZ9NpjMkMwSJEC/K9Iqc6Wmnp99BArKCz
yunIe7tg8STXs1CRNtb0m0Gy6xTKpnTCMBnBX0dPH2PtSv1VA+02rkx8RJ4Go0VzOSeEUHD5g+2H
07H0bIslvHmDgHcScebjA8D0PIXXmr/LaZhuXELVYn1uGYb6u6/kxJYT0SNapNJpee9xBbP6JP6j
gegsN/j7L3rLVfYM8BhMnEBXjhfHQ8aLmSqDxGpGg1T8CWnkihkmTO1TE3h4bgVK8mE98RfAkugM
rEHa9ZZ3SnrFyDCtcMTTTRPNVKoLA2LirL91Vlg0i2IttnTzIpfbukuvM1m0aAZaiyfjYTFRRzPp
VHxwS9aYQSfJC+FNgzkYmUrYej/Csye69xQM20rMoXuNZIBqV1GLdNyVSUgYcUn1gQtVltlzuNdw
8v6OJFHkQ2s0aVQc6JmUtl442C0MLhPw4iBS9JKFCXCsKX1SXE40xG34zuNkhBwFK/UsE/wFnUk6
0uNQw5Y99z2QfGfGl2/mchU7hUxVLxEgOddkTVTKiSDOqfWaZIRTV9TqYzgf8XckU4UJDIiw1pA=


--===============0959518771==--