bk commit into 5.0 tree (aelkin:1.2509) BUG#22725

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.0 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 10:56:18+03:00, aelkin@stripped +2 -0
  bug#22725
  
  test comments correction

  mysql-test/r/binlog_killed.result@stripped, 2007-05-30 10:54:48+03:00, aelkin@stripped +1 -1
    changed

  mysql-test/t/binlog_killed.test@stripped, 2007-05-30 10:54:49+03:00, aelkin@stripped +3 -3
    wrong comments (but important ones) left;
    little refinement in result calc

# 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:	/home/elkin/MySQL/TEAM/FIXES/5.0/bug22725-kill_inser_ta_binlog

--- 1.5/mysql-test/r/binlog_killed.result	2007-05-30 00:22:22 +03:00
+++ 1.6/mysql-test/r/binlog_killed.result	2007-05-30 10:54:48 +03:00
@@ -5,7 +5,7 @@ select get_lock("a", 20);
 get_lock("a", 20)
 1
 reset master;
-insert into t2 values (null, null), (null, get_lock("a", 10)),(null, get_lock("a", 10));
+insert into t2 values (null, null), (null, get_lock("a", 10));
 select @result /* must be zero either way */;
 @result
 0

--- 1.5/mysql-test/t/binlog_killed.test	2007-05-30 00:22:22 +03:00
+++ 1.6/mysql-test/t/binlog_killed.test	2007-05-30 10:54:49 +03:00
@@ -22,7 +22,7 @@ select get_lock("a", 20);
 connection con2;
 let $ID= `select connection_id()`;
 reset master;
-send insert into t2 values (null, null), (null, get_lock("a", 10)),(null, get_lock("a", 10));
+send insert into t2 values (null, null), (null, get_lock("a", 10));
 
 
 connection con1;
@@ -36,7 +36,7 @@ eval kill query $ID;
 connection con2;
 --error 0,ER_QUERY_INTERRUPTED
 reap;
-let $rows= `select count(*) from t2  /* must be 1 or 0 */`;
+let $rows= `select count(*) from t2  /* must be 2 or 0 */`;
 
 --exec $MYSQL_BINLOG --start-position=126 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
@@ -46,7 +46,7 @@ is not null;
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 let $error_code= `select @a like "%#%error_code=0%" /* must return 1 or 0*/`;
 let $insert_binlogged= `select @a like "%insert into%" /* must return 1 or 0 */`;
-eval set @result= $rows-2*$error_code - $insert_binlogged;
+eval set @result= $rows- $error_code - $insert_binlogged;
 
 enable_abort_on_error;
 enable_query_log;