Post-merge fix after merging the patch for bug#31590 to 5.1:

suppress the "Out of sort memory" error in the error log.

Post-merge fix after merging the patch for bug#31590 to 5.1:
suppress the "Out of sort memory" error in the error log.
6736c1b9 · kaa@kaamos.(none) · eeab00e3 · 6736c1b9
Commit 6736c1b9 authored Feb 14, 2008 by kaa@kaamos.(none)
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

mysql-test/lib/mtr_report.pl mysql-test/lib/mtr_report.pl +4 -1

No files found.
--- 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