Merge branch '2.1' into 2.2

This commit is contained in:
Johan Wikman 2018-05-02 10:40:24 +03:00
commit 8c9aa82a69

View File

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