diff options
| author | unknown <kaa@kaamos.(none)> | 2008-02-14 16:33:11 +0300 |
|---|---|---|
| committer | unknown <kaa@kaamos.(none)> | 2008-02-14 16:33:11 +0300 |
| commit | d740f5c67567479149d2aea524b2463748f3b7ac (patch) | |
| tree | f8aee1391c6a798f4fab53c6e12b6c1bac4dd6bf | |
| parent | 659c61168bd483e76b2f0404c94dcc64dbdae2e4 (diff) | |
| download | mariadb-git-d740f5c67567479149d2aea524b2463748f3b7ac.tar.gz | |
Post-merge fix after merging the patch for bug#31590 to 5.1:
suppress the "Out of sort memory" error in the error log.
| -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 73598fc1bac..1c1fe9aa6d5 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -363,7 +363,10 @@ sub mtr_report_stats ($) { # master /Slave: Unknown column 'c7' in 't15' Error_code: 1054/ or /Slave: Can't DROP 'c7'.* 1091/ or - /Slave: Key column 'c6'.* 1072/ + /Slave: Key column 'c6'.* 1072/ or + + # Test case for Bug#31590 produces the following error: + /Out of sort memory; increase server sort buffer size/ ) { next; # Skip these lines |