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
This commit is contained in:
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi 2007-05-30 16:32:36 +03:00
commit 1a491f3640

View file

@ -1,4 +1,5 @@
-- source include/have_innodb.inc
-- source include/have_binlog_format_mixed_or_statement.inc
###
### bug#22725 : incorrect killed error in binlogged query