diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-05-16 12:41:11 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-05-16 12:41:11 +0200 |
| commit | d795bc9ff8d4a4e17f249a0eb9ac01f25d53a259 (patch) | |
| tree | 34cb2909f877f529da8d539b32af9797189d62de /mysql-test/include | |
| parent | 9fae9930244d505585d83590051a17df9bab7d8a (diff) | |
| download | mariadb-git-d795bc9ff8d4a4e17f249a0eb9ac01f25d53a259.tar.gz | |
Fix race condition in binlog dump thread during server shutdown.
There was missing a check for THD::killed after THD::enter_cond(). This could
cause the binlog dump thread to miss the kill signal during server shutdown
and hang until it was force-closed.
Also fix a race in a test case that occasionally fails in Buildbot.
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/rpl_init.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/rpl_init.inc b/mysql-test/include/rpl_init.inc index 939a05d8011..98e3c468253 100644 --- a/mysql-test/include/rpl_init.inc +++ b/mysql-test/include/rpl_init.inc @@ -177,8 +177,8 @@ while ($_rpl_server) if (!$rpl_skip_reset_master_and_slave) { RESET MASTER; - RESET SLAVE; SET GLOBAL gtid_pos= ""; + RESET SLAVE; } eval SET auto_increment_increment= $rpl_server_count; eval SET auto_increment_offset= $_rpl_server; |