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

Always ignore server-internal databases

Browse Source 
The mysql, information_schema and performance_schema databases should
always be ignored if found on multiple servers.
This commit is contained in:
Markus Mäkelä
2019-07-23 09:20:33 +03:00
parent 8e23a6cdb9
commit fbeb5d9c84
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/modules/routing/schemarouter/schemaroutersession.cc
View File

@ -1192,11 +1192,13 @@ char* get_lenenc_str(void* data)
return rval; return rval;
} }
static const std::set<std::string> always_ignore = {"mysql", "information_schema", "performance_schema"};
bool SchemaRouterSession::ignore_duplicate_database(const char* data) bool SchemaRouterSession::ignore_duplicate_database(const char* data)
{ {
bool rval = false; bool rval = false;
if (m_config->ignored_dbs.find(data) != m_config->ignored_dbs.end()) if (m_config->ignored_dbs.count(data) || always_ignore.count(data))
{ {
rval = true; rval = true;
} }
@ -1379,8 +1381,7 @@ void SchemaRouterSession::query_databases()
"LEFT JOIN information_schema.tables AS t ON s.schema_name = t.table_schema " "LEFT JOIN information_schema.tables AS t ON s.schema_name = t.table_schema "
"WHERE t.table_name IS NULL " "WHERE t.table_name IS NULL "
"UNION " "UNION "
"SELECT CONCAT (table_schema, '.', table_name) FROM information_schema.tables " "SELECT CONCAT (table_schema, '.', table_name) FROM information_schema.tables");
"WHERE table_schema NOT IN ('information_schema', 'performance_schema', 'mysql');");
gwbuf_set_type(buffer, GWBUF_TYPE_COLLECT_RESULT); gwbuf_set_type(buffer, GWBUF_TYPE_COLLECT_RESULT);
for (SSRBackendList::iterator it = m_backends.begin(); it != m_backends.end(); it++) for (SSRBackendList::iterator it = m_backends.begin(); it != m_backends.end(); it++)