From d795bc9ff8d4a4e17f249a0eb9ac01f25d53a259 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 16 May 2013 12:41:11 +0200 Subject: 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. --- mysql-test/include/rpl_init.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/include/rpl_init.inc') 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; -- cgit v1.2.1