Skip to content

M
mariadb
Commit 03638e3a authored by aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi's avatar aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
Browse files
Options

bug#22725 

merge 5.0 with 5.1
parent 54772da0
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
mysql-test/t/binlog_killed.test
View file @ 03638e3a
...@@ -38,7 +38,7 @@ connection con2; ...@@ -38,7 +38,7 @@ connection con2;
reap; reap;
let $rows= `select count(*) from t2 /* must be 2 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 --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 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
eval select eval select
(@a:=load_file("$MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog")) (@a:=load_file("$MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7