bk commit into 5.1 tree (aelkin:1.2531)

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.1 repository of elkin. When elkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-30 22:33:54+03:00, aelkin@stripped
+1 -0
  Merge aelkin@stripped:/home/bk/mysql-5.0-rpl
  into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
  MERGE: 1.1810.2943.33

  mysql-test/t/binlog_killed.test@stripped, 2007-05-30 22:33:51+03:00,
aelkin@stripped +1 -1
    manual merge bug#22725 test
    MERGE: 1.6.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aelkin
# Host:	dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
# Root:	/tmp/merge_5.0/RESYNC

--- 1.8/mysql-test/t/binlog_killed.test	2007-05-30 16:14:53 +03:00
+++ 1.9/mysql-test/t/binlog_killed.test	2007-05-30 22:33:51 +03:00
@@ -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
 # 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);