From 6736c1b9e7bfde20314eeeaadb34a4f4b99c69eb Mon Sep 17 00:00:00 2001
From: "kaa@kaamos.(none)" <>
Date: Thu, 14 Feb 2008 16:33:11 +0300
Subject: [PATCH] Post-merge fix after merging the patch for bug#31590 to 5.1:
 suppress the "Out of sort memory" error in the error log.

---
 mysql-test/lib/mtr_report.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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