mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 23:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

automatic merge with 5.5

Browse source
This commit is contained in:
Michael Widenius 2012-06-27 17:22:23 +03:00
commit aa67a198e8
266 changed files with 7486 additions and 2353 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugin/semisync/semisync_master.cc
View file

@ -608,6 +608,7 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
set_timespec(start_ts, 0);
DEBUG_SYNC(current_thd, "rpl_semisync_master_commit_trx_before_lock");
/* Acquire the mutex. */
lock();
@ -738,15 +739,16 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
}
}
l_end:
/*
At this point, the binlog file and position of this transaction
must have been removed from ActiveTranx.
*/
assert(thd_killed(NULL) ||
!getMasterEnabled() ||
!active_tranxs_->is_tranx_end_pos(trx_wait_binlog_name,
trx_wait_binlog_pos));
l_end:
/* Update the status counter. */
if (is_on())
rpl_semi_sync_master_yes_transactions++;