diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 15:26:25 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 15:26:25 +0300 |
commit | 5f8561a6bcdb66e05ca539365cce33a9fc1817a2 (patch) | |
tree | 3ceb20e3e0e8fc1a0759199ccdf7238f31fd4267 /sql/rpl_mi.cc | |
parent | 3c2ab896b9642c43805a5dfc174c81fc5f902db0 (diff) | |
parent | 489ef007bec398c3b7b628325b225c3a015922cf (diff) | |
download | mariadb-git-5f8561a6bcdb66e05ca539365cce33a9fc1817a2.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/rpl_mi.cc')
-rw-r--r-- | sql/rpl_mi.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc index 0649a8f05e8..17c9029e1a5 100644 --- a/sql/rpl_mi.cc +++ b/sql/rpl_mi.cc @@ -170,6 +170,8 @@ void Master_info::clear_in_memory_info(bool all) { port= MYSQL_PORT; host[0] = 0; user[0] = 0; password[0] = 0; + domain_id_filter.clear_ids(); + reset_dynamic(&ignore_server_ids); } } @@ -1797,6 +1799,12 @@ void Domain_id_filter::reset_filter() m_filter= false; } +void Domain_id_filter::clear_ids() +{ + reset_dynamic(&m_domain_ids[DO_DOMAIN_IDS]); + reset_dynamic(&m_domain_ids[IGNORE_DOMAIN_IDS]); +} + /** Update the do/ignore domain id filter lists. |