Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0 mysql-test/t/binlog_killed.test: manual merge bug#22725 test
This commit is contained in:
commit
fec3d7c6ae
@ -1,5 +1,6 @@
|
||||
-- source include/have_innodb.inc
|
||||
-- source include/have_binlog_format_mixed_or_statement.inc
|
||||
-- source include/not_embedded.inc
|
||||
|
||||
###
|
||||
### bug#22725 : incorrect killed error in binlogged query
|
||||
@ -16,7 +17,6 @@ create table t3 (a int auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB;
|
||||
# effective test for bug#22725
|
||||
#
|
||||
|
||||
let $counter=200; # max 20 seconds to wait for insert performed the 1st row
|
||||
connection con1;
|
||||
select get_lock("a", 20);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user