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/version_sensitivity.cc
+++ b/query_classifier/test/version_sensitivity.cc
@ -134,7 +134,7 @@ int main(int argc, char* argv[])

        set_libdir(strdup(LIBDIR));

-        if (qc_setup(QC_LIB, NULL))
+        if (qc_setup(QC_LIB, QC_SQL_MODE_DEFAULT, NULL))
        {
            if (qc_process_init(QC_INIT_BOTH))
            {