List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:October 2 2008 10:46am
Subject:bzr push into mysql-5.1 branch (aelkin:2757)
View as plain text  
 2757 Andrei Elkin	2008-10-02 [merge]
      merge from the 5.1-5.1.29 to the local tree.
modified:
  mysql-test/extra/binlog_tests/binlog.test
  mysql-test/r/ctype_cp932_binlog_stm.result
  mysql-test/suite/binlog/r/binlog_row_binlog.result
  mysql-test/suite/binlog/r/binlog_stm_binlog.result
  mysql-test/suite/rpl/r/rpl_sp.result
  sql/item.cc
  sql/sp_head.cc

=== modified file 'mysql-test/lib/mtr_report.pl'
--- a/mysql-test/lib/mtr_report.pl	2008-08-12 10:26:23 +0000
+++ b/mysql-test/lib/mtr_report.pl	2008-10-02 07:46:14 +0000
@@ -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
Thread
• bzr push into mysql-5.1 branch (aelkin:2757) Andrei Elkin2 Oct