Merge branch '2.1-oracle-compat' into develop-new-merge-oracle

2017-06-28 22:30:16 +02:00
parent 14bb6cf99b 7f1a949198
commit 6cd6ded3d8
88 changed files with 15138 additions and 745 deletions
--- a/query_classifier/test/classify.c
+++ b/query_classifier/test/classify.c
@ -313,7 +313,7 @@ int main(int argc, char** argv)

        if (mxs_log_init(NULL, ".", MXS_LOG_TARGET_DEFAULT))
        {
-            if (qc_setup(lib, NULL) && qc_process_init(QC_INIT_BOTH))
+            if (qc_setup(lib, QC_SQL_MODE_DEFAULT, NULL) && qc_process_init(QC_INIT_BOTH))
            {
                rc = run(input_name, expected_name);
                qc_process_end(QC_INIT_BOTH);