Develop merge

2017-06-29 15:34:22 +02:00
parent 4993fd683c
commit cb57e10761
122 changed files with 16937 additions and 1627 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);