diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2016-06-12 20:14:51 +0300 |
|---|---|---|
| committer | Elena Stepanova <elenst@montyprogram.com> | 2016-06-12 20:14:51 +0300 |
| commit | 67b4a6f576db102d652b401c3d0150556826f641 (patch) | |
| tree | 62e5cd3c46704f37c55532570e342b8c3450c397 /mysql-test | |
| parent | 87007dc2f71634cc460271eb277ad851ec69c04b (diff) | |
| download | mariadb-git-67b4a6f576db102d652b401c3d0150556826f641.tar.gz | |
MDEV-8859 rpl.rpl_mdev382 sporadically fails to finish due to disappeared expect file
The combination of --remove_file and --write_file on .expect file creates
a race condition which can be hit by MTR which reads the file in a loop.
Instead, .expect file should be changed with --append_file.
It was fixed in 10.x, but in 5.5 the sporadic failure still affected buildbot.
Fixed 3 test files which use the problematic combination
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_mdev342.test | 3 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_mdev382.test | 3 | ||||
| -rw-r--r-- | mysql-test/suite/storage_engine/alter_tablespace.test | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/mysql-test/suite/binlog/t/binlog_mdev342.test b/mysql-test/suite/binlog/t/binlog_mdev342.test index 02310b87a76..024fa884f91 100644 --- a/mysql-test/suite/binlog/t/binlog_mdev342.test +++ b/mysql-test/suite/binlog/t/binlog_mdev342.test @@ -44,8 +44,7 @@ connection con1; --error 2006,2013 reap; ---remove_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect ---write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +--append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect restart-binlog_mdev342.test EOF diff --git a/mysql-test/suite/rpl/t/rpl_mdev382.test b/mysql-test/suite/rpl/t/rpl_mdev382.test index 21925e0e130..784617bd198 100644 --- a/mysql-test/suite/rpl/t/rpl_mdev382.test +++ b/mysql-test/suite/rpl/t/rpl_mdev382.test @@ -209,8 +209,7 @@ EOF --shutdown_server 30 ---remove_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect ---write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +--append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect restart-rpl_mdev382.test EOF diff --git a/mysql-test/suite/storage_engine/alter_tablespace.test b/mysql-test/suite/storage_engine/alter_tablespace.test index dec16e5a3ac..6318b410e6e 100644 --- a/mysql-test/suite/storage_engine/alter_tablespace.test +++ b/mysql-test/suite/storage_engine/alter_tablespace.test @@ -53,8 +53,7 @@ EOF --replace_result $datadir <DATADIR> --copy_file $datadir/test/t1.ibd $datadir/test/t1.ibd.save - --remove_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect - --write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect + --append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect restart EOF |