diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-06 22:31:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-06 22:31:30 +0200 |
| commit | b838d081ad346e52787753b1799c627922c4a6c7 (patch) | |
| tree | dc8f1e21e6b40d5b72668571c570c9a3214fbf32 /mysql-test/suite/binlog/t/binlog_killed_simulate.test | |
| parent | 824db55ce53963a64fcf648b54500df22c57e9b2 (diff) | |
| parent | 72c36f4415815d55ddb82b23682f3c549906c00e (diff) | |
| download | mariadb-git-b838d081ad346e52787753b1799c627922c4a6c7.tar.gz | |
mysql-5.5.33 merge
Diffstat (limited to 'mysql-test/suite/binlog/t/binlog_killed_simulate.test')
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_killed_simulate.test | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mysql-test/suite/binlog/t/binlog_killed_simulate.test b/mysql-test/suite/binlog/t/binlog_killed_simulate.test index ba111fd0145..0549c313e94 100644 --- a/mysql-test/suite/binlog/t/binlog_killed_simulate.test +++ b/mysql-test/suite/binlog/t/binlog_killed_simulate.test @@ -21,9 +21,6 @@ reset master; update t1 set a=2 /* will be "killed" after work has been done */; # a proof the query is binlogged with no error -#todo: introduce a suite private macro that provides numeric values -# for some constants like the offset of the first real event -# that is different between severs versions. let $MYSQLD_DATADIR= `select @@datadir`; --exec $MYSQL_BINLOG --force-if-open --start-position=$binlog_start_pos $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR @@ -48,14 +45,14 @@ reset master; --error ER_QUERY_INTERRUPTED load data infile '../../std_data/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */; - # a proof the query is binlogged with an error --let $binlog_load_data= query_get_value(SHOW BINLOG EVENTS, Pos, 3) --let $binlog_end= query_get_value(SHOW BINLOG EVENTS, Pos, 4) source include/show_binlog_events.inc; ---exec $MYSQL_BINLOG --force-if-open --start-position=$binlog_load_data --stop-position=$binlog_end $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog +--mkdir $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571 +--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571 --force-if-open --start-position=$binlog_load_data --stop-position=$binlog_end $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval select @@ -68,6 +65,8 @@ eval select $error_code /* must return 0 to mean the killed query is in */; # cleanup for the sub-case remove_file $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog; +--remove_files_wildcard $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571 * +--rmdir $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571 drop table t1,t2; |