List:Commits« Previous MessageNext Message »
From:Alexey Kopytov Date:February 14 2008 1:33pm
Subject:bk commit into 5.1 tree (kaa:1.2666) BUG#31590
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of kaa.  When kaa does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-14 16:33:11+03:00, kaa@kaamos.(none) +1 -0
  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@stripped, 2008-02-14 16:33:10+03:00, kaa@kaamos.(none) +4 -1
    Post-merge fix after merging the patch for bug#31590 to 5.1:
    suppress the "Out of sort memory" error in the error log.

diff -Nrup a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
--- a/mysql-test/lib/mtr_report.pl	2007-12-14 16:01:09 +03:00
+++ b/mysql-test/lib/mtr_report.pl	2008-02-14 16:33:10 +03:00
@@ -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
Thread
bk commit into 5.1 tree (kaa:1.2666) BUG#31590Alexey Kopytov14 Feb