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

Merge branch 'develop' into firewall

Browse Source
This commit is contained in:
Markus Makela
2014-11-13 09:50:02 +02:00
parent 50a5a7892d 59b587462a
commit afb8859b43
24 changed files with 756 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/filter/hint/hintparser.c
View File

@ -435,7 +435,7 @@ HINT_MODE mode = HM_EXECUTE;
token_free(tok);
} /*< while */
if (tok->token == TOK_EOL)
if ( tok && tok->token == TOK_EOL)
{
token_free(tok);
}

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

@ -398,7 +398,7 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue)
QLA_INSTANCE *my_instance = (QLA_INSTANCE *)instance;
QLA_SESSION *my_session = (QLA_SESSION *)session;
char *ptr;
int length;
int length = 0;
struct tm t;
struct timeval tv;

3
server/modules/filter/tee.c
View File

@ -415,8 +415,9 @@ GWBUF *clone = NULL;
modutil_MySQL_Query(queue, &dummy, &length, &residual);
clone = gwbuf_clone(queue);
my_session->residual = residual;
free(ptr);
}
free(ptr);
}
/* Pass the query downstream */

4
server/modules/filter/topfilter.c
View File

@ -314,10 +314,10 @@ char *remote, *user;
else
my_session->userName = NULL;
my_session->active = 1;
if (my_instance->source && strcmp(my_session->clientHost,
if (my_instance->source && my_session->clientHost && strcmp(my_session->clientHost,
my_instance->source))
my_session->active = 0;
if (my_instance->user && strcmp(my_session->userName,
if (my_instance->user && my_session->userName && strcmp(my_session->userName,
my_instance->user))
my_session->active = 0;