diff options
| author | unknown <cmiller@zippy.(none)> | 2006-07-07 10:47:51 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-07-07 10:47:51 -0400 |
| commit | 8ceaccb3fa194ea2e548bc369aaae0920522a4d8 (patch) | |
| tree | e8dde19297673c55f3bb0e8fd6b3b37e29711df2 | |
| parent | 30de4903ae2b9cd03bd5f853715e7fc7b648c2c7 (diff) | |
| download | mariadb-git-8ceaccb3fa194ea2e548bc369aaae0920522a4d8.tar.gz | |
Merge cleanup, with a change of verbose test status to Off.
mysql-test/lib/mtr_process.pl:
Resolved a previous bad merge of two different attempts at fixing the same problem.
mysql-test/mysql-test-run.pl:
Default for verbose should be Off.
| -rw-r--r-- | mysql-test/lib/mtr_process.pl | 2 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 143bb40c3d1..b593d80a5e8 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -951,7 +951,7 @@ sub mtr_kill_process ($$$) { my $timeout= shift; # Seconds to wait for process my $max_loop= $timeout*10; # Sleeping 0.1 between each kill attempt - for (my $cur_attempt= 1; $cur_attempt <= $total_retries; ++$cur_attempt) + for (my $cur_attempt= 1; $cur_attempt <= $max_loop; ++$cur_attempt) { mtr_debug("Sending $signal to $pid..."); diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 9192ea20529..43cab03f12a 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -168,7 +168,7 @@ our $opt_suite; our $opt_netware; our $opt_script_debug= 0; # Script debugging, enable with --script-debug -our $opt_verbose= 1; # Verbose output, enable with --verbose +our $opt_verbose= 0; # Verbose output, enable with --verbose # Options FIXME not all.... |