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/server/core/gateway.cc
+++ b/server/core/gateway.cc
@ -1889,7 +1889,7 @@ int main(int argc, char **argv)
    cnf = config_get_global_options();
    ss_dassert(cnf);

-    if (!qc_setup(cnf->qc_name, cnf->qc_args))
+    if (!qc_setup(cnf->qc_name, cnf->qc_sql_mode, cnf->qc_args))
    {
        const char* logerr = "Failed to initialise query classifier library.";
        print_log_n_stderr(true, true, logerr, logerr, eno);