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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Johan Wikman
2018-10-01 13:10:41 +03:00
parent c65edd1298 c58a461f87
commit dbbadf1f53
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/Changelog.md
View File

@ -40,6 +40,7 @@ For more details, please refer to:
For more details, please refer to:
* [MariaDB MaxScale 2.2.15 Release Notes](Release-Notes/MaxScale-2.2.15-Release-Notes.md)
* [MariaDB MaxScale 2.2.14 Release Notes](Release-Notes/MaxScale-2.2.14-Release-Notes.md)
* [MariaDB MaxScale 2.2.13 Release Notes](Release-Notes/MaxScale-2.2.13-Release-Notes.md)
* [MariaDB MaxScale 2.2.12 Release Notes](Release-Notes/MaxScale-2.2.12-Release-Notes.md)
* [MariaDB MaxScale 2.2.11 Release Notes](Release-Notes/MaxScale-2.2.11-Release-Notes.md)

2
Documentation/Release-Notes/MaxScale-2.2.15-Release-Notes.md
View File

@ -1,4 +1,4 @@
# MariaDB MaxScale 2.2.15 Release Notes
# MariaDB MaxScale 2.2.15 Release Notes -- 2018-10-01
Release 2.2.15 is a GA release.

2
server/modules/filter/cache/rules.cc vendored
View File

@ -1277,7 +1277,7 @@ static bool cache_rule_matches_column_regexp(CACHE_RULE* self,
table_len = default_table_len;
}
char buffer[database_len + 1 + table_len + strlen(info->column) + 1];
char buffer[database_len + 1 + table_len + 1 + strlen(info->column) + 1];
buffer[0] = 0;
if (database)