merge mysql-5.1 --> mysql-5.5

47238d44 · Alfranio Correia · a64a0e0f · 5a19661d · 47238d44
Commit 47238d44 authored Jan 26, 2011 by Alfranio Correia
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/disabled.def +2 -0

No files found.
--- a/mysql-test/suite/rpl/t/disabled.def
+++ b/mysql-test/suite/rpl/t/disabled.def
@@ -16,3 +16,5 @@ rpl_row_create_table      : Bug#51574 2010-02-27 andrei failed different way tha
 rpl_spec_variables        : BUG#47661 2009-10-27 jasonh rpl_spec_variables fails on PB2 hpux
 rpl_log_pos               : BUG#55675 2010-09-10 alfranio rpl.rpl_log_pos fails sporadically with error binlog truncated in the middle
 rpl_get_master_version_and_clock : Bug#59178 Jan 05 2011 joro Valgrind warnings rpl_get_master_version_and_clock
+rpl_row_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
+rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out