hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Marko
2019-08-29 02:00:16 +03:00
parent a09c2a800d 7a1abc26d8
commit 0bb53bf411
7 changed files with 96 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/routing/schemarouter/schemarouter.cc
View File

@ -40,10 +40,6 @@ Config::Config(MXS_CONFIG_PARAMETER* conf)
ignore_match_data = pcre2_match_data_create_from_pattern(ignore_regex, NULL);
}
ignored_dbs.insert("mysql");
ignored_dbs.insert("information_schema");
ignored_dbs.insert("performance_schema");
std::string ignored_dbs_str = conf->get_string(CN_IGNORE_TABLES);
if (ignored_dbs_str.empty())
{
@ -59,7 +55,7 @@ Config::Config(MXS_CONFIG_PARAMETER* conf)
{
for (const auto& a : mxs::strtok(ignored_dbs_str, ", \t"))
{
ignored_dbs.insert(a);
ignored_tables.insert(a);
}
}
}