bzr commit into mysql-5.1 branch (aelkin:2687) Bug#15580, Bug#28786

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/FIXES/5.1-rpl-bug28786-binlog_killed.test/

 2687 Andrei Elkin	2008-09-16
      Bug #28786 binlog_killed.test fails: 'reset master' does not reset binlogging
      
      The test failed originally -- did not reset binlogging - for the reason
      identified by bug#15580.
      However it can not run on the embedded platfrom for yet another cause -
      the embedded can not KILL query.
      
      Fixed with adding comments to the test particularly addressing `reset master'
      to the mentioned bug.
modified:
  mysql-test/suite/binlog/t/binlog_killed.test

per-file messages:
  mysql-test/suite/binlog/t/binlog_killed.test
    adding commets explaining why the test has to have include/not_embedded.inc guard.
=== modified file 'mysql-test/suite/binlog/t/binlog_killed.test'
--- a/mysql-test/suite/binlog/t/binlog_killed.test	2008-02-28 11:21:44 +0000
+++ b/mysql-test/suite/binlog/t/binlog_killed.test	2008-09-16 10:08:29 +0000
@@ -1,5 +1,10 @@
 -- source include/have_innodb.inc
 -- source include/have_binlog_format_mixed_or_statement.inc
+
+# You cannot use `KILL' with the Embedded MySQL Server library,
+# because the embedded server merely runs inside the threads of the host
+# application. -- the docs
+
 -- source include/not_embedded.inc
 
 ###
@@ -22,6 +27,12 @@ select get_lock("a", 20);
 
 connection con2;
 let $ID= `select connection_id()`;
+
+#
+# reset master does not reset binlogging on the embedded server.
+# the test is not run on the embedded for reason of using KILL query.
+# `reset master' problem is to be addressed by bug#15580 fixes.
+#
 reset master;
 send insert into t2 values (null, null), (null, get_lock("a", 10));