mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
This commit is contained in:
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi 2007-05-30 22:33:54 +03:00
commit 4835204dcc
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/t/binlog_killed.test
View file

@ -1,5 +1,6 @@
-- source include/have_innodb.inc -- source include/have_innodb.inc
-- source include/have_binlog_format_mixed_or_statement.inc -- source include/have_binlog_format_mixed_or_statement.inc
-- source include/not_embedded.inc
### ###
### bug#22725 : incorrect killed error in binlogged query ### 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 # effective test for bug#22725
# #
let $counter=200; # max 20 seconds to wait for insert performed the 1st row
connection con1; connection con1;
select get_lock("a", 20); select get_lock("a", 20);