merged 5.1-5.1.29-rc

de572736 · Georgi Kodinov · 452fed70 · a5dee74d · de572736
Commit de572736 authored Oct 03, 2008 by Georgi Kodinov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/mysql-test/lib/mtr_report.pl
+++ b/mysql-test/lib/mtr_report.pl
@@ -312,7 +312,7 @@ sub mtr_report_stats ($) {
 		/Slave: According to the master's version/ or
 		/Slave: Column [0-9]* type mismatch/ 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