diff options
author | Mattias Jonsson <mattiasj@mysql.com> | 2008-08-11 16:15:39 +0200 |
---|---|---|
committer | Mattias Jonsson <mattiasj@mysql.com> | 2008-08-11 16:15:39 +0200 |
commit | 2ace7dc939ea28b5ee7bc526f5fa49142cb2de54 (patch) | |
tree | 9534523e039b009438c589d987ce10bbdcc0c305 /mysql-test/lib | |
parent | 1c108906c6d1020e9ae5cd90e987bc8eadcb9eb7 (diff) | |
parent | ce30b928b7002a2e5b1b21860ba29336b51ce235 (diff) | |
download | mariadb-git-2ace7dc939ea28b5ee7bc526f5fa49142cb2de54.tar.gz |
merge into an updated 5.1-bugteam tree
Diffstat (limited to 'mysql-test/lib')
-rw-r--r-- | mysql-test/lib/mtr_report.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index b83f40626aa..bee03e82e24 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -402,7 +402,10 @@ sub mtr_report_stats ($) { )) or # Test case for Bug#31590 produces the following error: - /Out of sort memory; increase server sort buffer size/ + /Out of sort memory; increase server sort buffer size/ or + + # Bug#35161, test of auto repair --myisam-recover + /able.*_will_crash/ ) { next; # Skip these lines |