bzr push into mysql-6.0 branch (sven:2834 to 2835)

[Sven Sandberg]

 2835 Sven Sandberg	2008-10-01 [merge]
      merge
modified:
  mysql-test/suite/rpl/t/disabled.def

 2834 Georgi Kodinov	2008-10-01 [merge]
      merge 5.1-bugteam -> 6.0-bugteam

=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2008-08-25 15:03:24 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2008-10-01 14:11:12 +0000
@@ -33,5 +33,5 @@ rpl_idempotency            : Bug#37767 2
 rpl_flushlog_loop          : Bug#37733 2008-07-17 alik Disabled to make 6.0 greaner (the test fails too often)
 rpl_locktrans_innodb       : Bug#37712 2008-07-17 alik Disabled to make 6.0 greaner (the test fails too often)
 rpl_temporary_errors       : Bug#36968 2008-07-17 alik Disabled to make 6.0 greaner (the test fails too often)
-rpl_temporary              : BUG#38269 2008-07-21 Sven valgrind error in pushbuild
+#rpl_temporary              : BUG#38269 2008-07-21 Sven valgrind error in pushbuild
 rpl_flushlog_loop          : BUG#37733 2008-07-23 Sven disabled in 5.1-bugteam. the bug has been fixed in 5.1-rpl: please re-enable when that gets pushed to main