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

Merge branch '2.1' into develop

Browse Source
This commit is contained in:
Johan Wikman
2017-08-15 10:31:30 +03:00
parent 49ba1f8fa0 3485a32731
commit de7004cb95
12 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -594,11 +594,11 @@ static CACHE_RULE *cache_rule_create_simple_user(cache_rule_attribute_t attribut
const char *cvalue,
uint32_t debug)
{
CACHE_RULE *rule = NULL;
ss_dassert(attribute == CACHE_ATTRIBUTE_USER);
ss_dassert((op == CACHE_OP_EQ) || (op == CACHE_OP_NEQ));
CACHE_RULE *rule = NULL;
bool error = false;
size_t len = strlen(cvalue);
@ -909,7 +909,7 @@ static CACHE_RULE *cache_rule_create_simple(cache_rule_attribute_t attribute,
{
ss_dassert((op == CACHE_OP_EQ) || (op == CACHE_OP_NEQ));
CACHE_RULE *rule;
CACHE_RULE *rule = NULL;
switch (attribute)
{
@ -1524,7 +1524,7 @@ static bool cache_rule_matches_table_regexp(CACHE_RULE *self,
bool matches = false;
int n;
char **names;
char **names = NULL;
bool fullnames;
fullnames = true;
@ -1610,7 +1610,7 @@ static bool cache_rule_matches_table_simple(CACHE_RULE *self, const char *defaul
}
int n;
char **names;
char **names = NULL;
names = qc_get_table_names((GWBUF*)query, &n, fullnames);

2
server/modules/filter/dbfwfilter/dbfwfilter.c
View File

@ -1036,7 +1036,7 @@ char* get_regex_string(char** saved)
{
char *start = NULL, *ptr = *saved;
bool escaped = false, quoted = false;
char delimiter;
char delimiter = 0;
while (*ptr != '\0')
{
if (!escaped)