diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-04-24 13:05:40 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-04-24 13:05:40 +0200 |
| commit | 6b97512b2170fc6a77288cef6e5a85cad773ae4e (patch) | |
| tree | bd421a2a8277225f224a12995c5a17fac145f1b5 /mysql-test/suite/storage_engine | |
| parent | bb5b0a9f5bea18711cd849cbd8d4114764b505b8 (diff) | |
| download | mariadb-git-6b97512b2170fc6a77288cef6e5a85cad773ae4e.tar.gz | |
Add missing check for thd->killed in mysql_binlog_send().
The slave dump thread running on the master only checked thd->killed whenever
it reached the end of a binlog file, not between events. This could
unnecessarily delay server shutdown.
This was found by code inspection while tracking down some occasional "forcing
close of thread..." errors in Buildbot. Hopefully this will fix the failures,
but the fix is correct in any case.
Also increase the wait during server shutdown, 2 seconds is a bit tight in
case of heavy I/O stall, and it seems better to delay shutdown a bit than
force-kill threads unnecessarily.
Also fix some races in test cases that restart the mysqld server. The .expect
file should be changed with --append_file, --remove_file + --write_file
creates a short window where mysqld can error out due to .expect file missing.
Diffstat (limited to 'mysql-test/suite/storage_engine')
| -rw-r--r-- | mysql-test/suite/storage_engine/alter_tablespace.test | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/suite/storage_engine/alter_tablespace.test b/mysql-test/suite/storage_engine/alter_tablespace.test index 508639c7dc5..ac206b8e328 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 |