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/canonical_tests/canonizer.c
+++ b/query_classifier/test/canonical_tests/canonizer.c
@ -46,7 +46,7 @@ int main(int argc, char** argv)
    set_langdir(strdup("."));
    set_process_datadir(strdup("/tmp"));

-    qc_setup("qc_sqlite", NULL);
+    qc_setup("qc_sqlite", QC_SQL_MODE_DEFAULT, NULL);
    qc_process_init(QC_INIT_BOTH);

    infile = fopen(argv[1], "rb");