List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:October 2 2008 10:53am
Subject:bzr push into mysql-6.0 branch (aelkin:2838) Bug#36968
View as plain text  
 2838 Andrei Elkin	2008-10-02 [merge]
      merge with 5.1-5.1.29 (backported from 6.0-main fixes of bug#36968)
modified:
  mysql-test/lib/mtr_report.pl

=== modified file 'mysql-test/lib/mtr_report.pl'
--- a/mysql-test/lib/mtr_report.pl	2008-09-08 11:05:26 +0000
+++ b/mysql-test/lib/mtr_report.pl	2008-10-02 08:52:13 +0000
@@ -315,7 +315,7 @@ sub mtr_report_stats ($) {
                 /Slave: Unknown column 'c7' in 't15' Error_code: 1054/ or
                 /Slave: Key column 'c6' doesn't exist in table Error_code: 1072/ or
 		/Slave: Error .* doesn't exist/ or
-		/Slave: Error .*Deadlock found/ or
+		/Slave: Deadlock found/ or
 		/Slave: Error .*Unknown table/ or
 		/Slave: Error in Write_rows event: / or
 		/Slave: Field .* of table .* has no default value/ or
Thread
• bzr push into mysql-6.0 branch (aelkin:2838) Bug#36968Andrei Elkin2 Oct