diff options
| author | unknown <monty@mysql.com> | 2006-05-04 22:27:12 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-05-04 22:27:12 +0300 |
| commit | edfc33bed04e0bffc78e7ff36c4d8a97cb8c1646 (patch) | |
| tree | 5e5925fe2b3656d07634b7f3f946f06629c45ea0 /mysql-test/lib | |
| parent | 80d86948e2d457d2f413804b28f8e27a78780b36 (diff) | |
| parent | afe4715242576a8575abcec955baa4bfd78af85e (diff) | |
| download | mariadb-git-edfc33bed04e0bffc78e7ff36c4d8a97cb8c1646.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_lex.cc:
manual merge
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_report.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index bda264064b9..56601d9236a 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -157,6 +157,7 @@ sub mtr_report_stats ($) { my $tot_passed= 0; my $tot_failed= 0; my $tot_tests= 0; + my $found_problems= 0; # Some warnings are errors... foreach my $tinfo (@$tests) { @@ -214,8 +215,6 @@ sub mtr_report_stats ($) { } else { - my $found_problems= 0; # Some warnings are errors... - # We report different types of problems in order foreach my $pattern ( "^Warning:", "^Error:", "^==.* at 0x", "InnoDB: Warning", "missing DBUG_RETURN", @@ -268,6 +267,9 @@ sub mtr_report_stats ($) { } } print "\n"; + } + if ( $tot_failed != 0 || $found_problems) + { mtr_error("there where failing test cases"); } } |