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:
Markus Mäkelä
2018-01-03 14:07:09 +02:00
parent 810a9d6183 7d8905d91f
commit e8f52951d1
29 changed files with 667 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,9 +285,8 @@ newSession(MXS_FILTER *instance, MXS_SESSION *session)
MXS_FREE(my_session);
return NULL;
}
sprintf(my_session->filename, "%s.%d", my_instance->filebase,
my_instance->sessions);
atomic_add(&my_instance->sessions, 1);
sprintf(my_session->filename, "%s.%lu", my_instance->filebase, session->ses_id);
my_session->top = (TOPNQ **) MXS_CALLOC(my_instance->topN + 1, sizeof(TOPNQ *));
MXS_ABORT_IF_NULL(my_session->top);
for (i = 0; i < my_instance->topN; i++)