database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.11 into 11.0

Browse Source
This commit is contained in:
Marko Mäkelä
2024-03-28 10:51:36 +02:00
parent 62243c444f a79fb66a98
commit fec2fd6add
490 changed files with 14843 additions and 4704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/log.cc
View File

@@ -7024,8 +7024,8 @@ err:
mysql_mutex_assert_not_owner(&LOCK_after_binlog_sync);
mysql_mutex_assert_not_owner(&LOCK_commit_ordered);
#ifdef HAVE_REPLICATION
if (repl_semisync_master.report_binlog_update(thd, log_file_name,
file->pos_in_file))
if (repl_semisync_master.report_binlog_update(
thd, thd, log_file_name, file->pos_in_file))
{
sql_print_error("Failed to run 'after_flush' hooks");
error= 1;
@@ -8619,9 +8619,19 @@ MYSQL_BIN_LOG::trx_group_commit_leader(group_commit_entry *leader)
for (current= queue; current != NULL; current= current->next)
{
#ifdef HAVE_REPLICATION
/*
The thread which will await the ACK from the replica can change
depending on the wait-point. If AFTER_COMMIT, then the user thread
will perform the wait. If AFTER_SYNC, the binlog group commit leader
will perform the wait on behalf of the user thread.
*/
THD *waiter_thd= (repl_semisync_master.wait_point() ==
SEMI_SYNC_MASTER_WAIT_POINT_AFTER_STORAGE_COMMIT)
? current->thd
: leader->thd;
if (likely(!current->error) &&
unlikely(repl_semisync_master.
report_binlog_update(current->thd,
report_binlog_update(current->thd, waiter_thd,
current->cache_mngr->
last_commit_pos_file,
current->cache_mngr->
@@ -11172,7 +11182,7 @@ Recovery_context::Recovery_context() :
prev_event_pos(0),
last_gtid_standalone(false), last_gtid_valid(false), last_gtid_no2pc(false),
last_gtid_engines(0),
do_truncate(repl_semisync_slave.get_slave_enabled()),
do_truncate(global_rpl_semi_sync_slave_enabled),
truncate_validated(false), truncate_reset_done(false),
truncate_set_in_1st(false), id_binlog(MAX_binlog_id),
checksum_alg(BINLOG_CHECKSUM_ALG_UNDEF), gtid_maybe_to_truncate(NULL)