bk commit into 6.0 tree (kostja:1.2628) BUG#28786

[konstantin]

Below is the list of changes that have just been committed into a local
6.0 repository of kostja.  When kostja does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-20 01:26:24+04:00, kostja@bodhi.(none) +1 -0
  Disable binlog_killed.test (Bug#28786)

  mysql-test/suite/binlog/t/disabled.def@stripped, 2008-04-20 01:26:21+04:00, kostja@bodhi.(none) +1 -0
    Disable binlog_killed.test (Bug#28786)

diff -Nrup a/mysql-test/suite/binlog/t/disabled.def b/mysql-test/suite/binlog/t/disabled.def
--- a/mysql-test/suite/binlog/t/disabled.def	2008-03-14 20:33:12 +03:00
+++ b/mysql-test/suite/binlog/t/disabled.def	2008-04-20 01:26:21 +04:00
@@ -13,3 +13,4 @@ binlog_multi_engine  : Bug#29829 2007-07
 binlog_row_ctype_cp932 : Bug #33376 2007-12-19 mats Write set for table not set correctly when inserting an empty set
 binlog_multi_engine      : Bug#32663 binlog_multi_engine.test fails randomly
 binlog_base64_flag : BUG#33247 2007-12-14 Sven: mysqlbinlog does not clean up after itself on termination. When compiled in debug mode, this test generates lots of warnings for memory leaks.
+binlog_killed : Bug#28786 binlog_killed.test fails: 'reset master' does not reset binlogging