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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-10-21 16:06:34 +03:00
parent 78dec1f199 a0fda162eb
commit 73f5cbd0b6
91 changed files with 2362 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_repl.cc
View File

@ -3959,6 +3959,16 @@ err:
mi->unlock_slave_threads();
if (ret == FALSE)
my_ok(thd);
else
{
/*
Depending on where CHANGE MASTER failed, the logs may be waiting to be
reopened. This would break future log updates and CHANGE MASTER calls.
`try_fix_log_state()` allows the relay log to fix its state to no longer
expect to be reopened.
*/
mi->rli.relay_log.try_fix_log_state();
}
DBUG_RETURN(ret);
}