1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
restore sergii@pisem.net-20120327141644-xue6r05x1giswwsm
that was lost in a merge
This commit is contained in:
Sergei Golubchik 2013-11-10 17:51:26 +01:00
parent 5ffa6904d2
commit 07d3fc5220
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugin/semisync/semisync_master.cc
View File

@ -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: