Commit 07d3fc52 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-201 - Assertion `!thd->spcont' failed in net_send_error on server shutdown

restore sergii@pisem.net-20120327141644-xue6r05x1giswwsm
that was lost in a merge
parent 5ffa6904
......@@ -629,7 +629,7 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
(int)is_on());
}
while (is_on())
while (is_on() && !thd_killed(NULL))
{
if (reply_file_name_inited_)
{
......@@ -741,7 +741,8 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
At this point, the binlog file and position of this transaction
must have been removed from ActiveTranx.
*/
assert(!active_tranxs_->is_tranx_end_pos(trx_wait_binlog_name,
assert(thd_killed(NULL) ||
!active_tranxs_->is_tranx_end_pos(trx_wait_binlog_name,
trx_wait_binlog_pos));
l_end:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment