diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 20:41:24 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 20:41:24 +0300 |
| commit | 4d21a145de11eaff28f98fe4ebed56a803450ce0 (patch) | |
| tree | 5c4b00b96e189e3492de198c4080265e81efc832 /sql/sql_repl.cc | |
| parent | 4f59f9078fd9af1e958f4a30788084598053bf50 (diff) | |
| parent | 059a5f11711fd502982abed8781faf9f255fa975 (diff) | |
| download | mariadb-git-bb-10.6-MDEV-26769.tar.gz | |
Merge 10.6bb-10.6-MDEV-26769
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 7bcff12a735..90fdce1b56f 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -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); } |