Merge branch '2.2' into develop

2018-01-16 09:51:13 +02:00
parent 27e563dcff 0afe10ffb9
commit df70f23635
24 changed files with 954 additions and 88 deletions
--- a/server/modules/filter/namedserverfilter/namedserverfilter.cc
+++ b/server/modules/filter/namedserverfilter/namedserverfilter.cc
@ -280,6 +280,7 @@ RegexHintFilter::create(const char* name, char** options, MXS_CONFIG_PARAMETER*
    }
    else if (legacy_mode && !mapping.size())
    {
+        MXS_WARNING("Use of legacy parameters 'match' and 'server' is deprecated.");
        /* Using legacy mode and no indexed parameters found. Add the legacy parameters
         * to the mapping. */
        if (!regex_compile_and_add(pcre_ops, true, match_val_legacy, server_val_legacy,