Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl

into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl

mysql-test/t/binlog_killed.test

 -- source include/have_innodb.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
 
 ###
 ### bug#22725 : incorrect killed error in binlogged query