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-05-02 10:45:59 +03:00
parent 7876c3c70f 8c9aa82a69
commit 64d84cf1e0
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/poll.cc
View File

@ -329,7 +329,7 @@ namespace
struct EVENT_TIMES_CB_DATA
{
int rowno;
Worker::STATISTICS* stats;
Worker::STATISTICS stats;
};
}
@ -372,10 +372,10 @@ eventTimesRowCallback(RESULTSET *set, void *v)
resultset_row_set(row, 0, buf);
}
snprintf(buf, 39, "%u", data->stats->qtimes[data->rowno]);
snprintf(buf, 39, "%u", data->stats.qtimes[data->rowno]);
buf[39] = '\0';
resultset_row_set(row, 1, buf);
snprintf(buf, 39, "%u", data->stats->exectimes[data->rowno]);
snprintf(buf, 39, "%u", data->stats.exectimes[data->rowno]);
buf[39] = '\0';
resultset_row_set(row, 2, buf);
data->rowno++;
@ -398,10 +398,8 @@ eventTimesGetList()
return NULL;
}
Worker::STATISTICS s = Worker::get_statistics();
data->rowno = 0;
data->stats = &s;
data->stats = Worker::get_statistics();
if ((set = resultset_create(eventTimesRowCallback, data)) == NULL)
{

4
server/core/session.cc
View File

@ -834,6 +834,10 @@ sessionRowCallback(RESULTSET *set, void *data)
row = cbdata->row;
cbdata->row = NULL;
}
else
{
MXS_FREE(cbdata);
}
return row;
}