Merge branch '2.1' into 2.2

2018-05-02 10:40:24 +03:00
parent 3d8c447b3a b8bba93f08
commit 8c9aa82a69
1 changed files with 4 additions and 0 deletions
--- a/server/core/session.cc
+++ b/server/core/session.cc
@ -816,6 +816,10 @@ sessionRowCallback(RESULTSET *set, void *data)
        row = cbdata->row;
        cbdata->row = NULL;
    }
+    else
+    {
+        MXS_FREE(cbdata);
+    }

    return row;
 }