Merge branch '2.2' into develop

2018-05-02 10:45:59 +03:00
parent 7876c3c70f 8c9aa82a69
commit 64d84cf1e0
2 changed files with 8 additions and 6 deletions
--- a/server/core/session.cc
+++ b/server/core/session.cc
@ -834,6 +834,10 @@ sessionRowCallback(RESULTSET *set, void *data)
        row = cbdata->row;
        cbdata->row = NULL;
    }
+    else
+    {
+        MXS_FREE(cbdata);
+    }

    return row;
 }