Merge branch '2.1' into 2.2

2017-12-29 08:42:49 +02:00
parent da77b0419c b543f37a11
commit 8b2aa52384
13 changed files with 207 additions and 5 deletions
--- a/server/core/test/test_trxtracking.cc
+++ b/server/core/test/test_trxtracking.cc
@ -420,6 +420,8 @@ int main(int argc, char* argv[])

        if (mxs_log_init(NULL, ".", MXS_LOG_TARGET_DEFAULT))
        {
+            set_libdir(strdup("../../../query_classifier/qc_sqlite"));
+
            // We have to setup something in order for the regexes to be compiled.
            if (qc_setup("qc_sqlite", QC_SQL_MODE_DEFAULT, NULL) &&
                qc_process_init(QC_INIT_BOTH) &&