summaryrefslogtreecommitdiff
path: root/sql/sql_repl.cc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2011-05-09 15:06:16 +0200
committerunknown <knielsen@knielsen-hq.org>2011-05-09 15:06:16 +0200
commite2ff2885319e480477e8f7d2824065ee4f4363a6 (patch)
treec8e874e57113843e0cd4210067e4f2defa77e9c0 /sql/sql_repl.cc
parent6b8788e425f649bcdb0f882c81b081795005fbe7 (diff)
downloadmariadb-git-e2ff2885319e480477e8f7d2824065ee4f4363a6.tar.gz
Fix buildbot failure in rpl_stop_slave.test.
Problem was setting DEBUG_SYNC twice in a row too fast in the test case; this could cause the second setting to override the first before the code had time to react to the first, causing the signal to get lost. Fixed by waiting for the code to receive the first signal before overwriting it in the test case.
Diffstat (limited to 'sql/sql_repl.cc')
-rw-r--r--sql/sql_repl.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index 418c2985f85..5038d02abca 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -571,6 +571,11 @@ impossible position";
DBUG_ASSERT(opt_debug_sync_timeout > 0);
DBUG_ASSERT(!debug_sync_set_action(current_thd,
STRING_WITH_LEN(act)));
+ const char act2[]=
+ "now "
+ "signal signal.continued";
+ DBUG_ASSERT(!debug_sync_set_action(current_thd,
+ STRING_WITH_LEN(act2)));
}
});