database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2021-10-21 13:41:04 +03:00
parent 1388845e04 1a2308d3f4
commit e4a7c15dd6
70 changed files with 1947 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/rpl_mi.cc
View File

@ -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);
}
}
@ -1793,6 +1795,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.