diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-22 14:41:47 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-22 14:41:47 +0300 |
commit | 71d4ecf182642dbb9ec7c155d3b2606b8b1fb4a2 (patch) | |
tree | 863c77156e486dec16505ba6586208879ad27e5f /sql/rpl_mi.cc | |
parent | 45a376dd2d505af343cfff68e4343c7650f2565c (diff) | |
parent | 1f02280904fcfbb2bd86404d1c85c025634f8c9d (diff) | |
download | mariadb-git-71d4ecf182642dbb9ec7c155d3b2606b8b1fb4a2.tar.gz |
Merge 10.6 into 10.7
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 68753647366..4fd36891a4b 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); } } @@ -1816,6 +1818,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. |