Merge branch '2.2' into develop

2018-07-26 11:27:09 +03:00
parent fbce38878b 571d52f557
commit 6c59da77fb
29 changed files with 409 additions and 417 deletions
--- a/server/core/queryclassifier.cc
+++ b/server/core/queryclassifier.cc
@ -182,6 +182,16 @@ bool foreach_table(QueryClassifier& qc,
        }
    }

+    if (tables)
+    {
+        for (int i = 0; i < n_tables; i++)
+        {
+            MXS_FREE(tables[i]);
+        }
+
+        MXS_FREE(tables);
+    }
+
    return rval;
 }