bug#22725

merge 5.0 with 5.1

bug#22725
merge 5.0 with 5.1
03638e3a · aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi · 54772da0 · 03638e3a
Commit 03638e3a authored May 30, 2007 by aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/t/binlog_killed.test mysql-test/t/binlog_killed.test +1 -1

No files found.
--- a/mysql-test/t/binlog_killed.test
+++ b/mysql-test/t/binlog_killed.test
@@ -38,7 +38,7 @@ connection con2;
 reap;
 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
+--exec $MYSQL_BINLOG --start-position=134 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval select
 (@a:=load_file("$MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog"))