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/crash_qc_sqlite.c
+++ b/query_classifier/test/crash_qc_sqlite.c
@ -41,7 +41,7 @@ int main()

    set_libdir(strdup("../qc_sqlite"));

-    if (qc_setup("qc_sqlite", NULL) && qc_process_init(QC_INIT_BOTH))
+    if (qc_setup("qc_sqlite", QC_SQL_MODE_DEFAULT, NULL) && qc_process_init(QC_INIT_BOTH))
    {
        const char s[] = "SELECT @@global.max_allowed_packet";