Merge branch '2.2' into 2.2-mrm

2017-09-28 15:19:20 +03:00
parent ff467e218a 9c60b68476
commit 89d1f81e37
70 changed files with 748 additions and 705 deletions
--- a/server/core/config.cc
+++ b/server/core/config.cc
@ -1203,7 +1203,7 @@ bool config_get_compiled_regexes(const MXS_CONFIG_PARAMETER *params,
    {
        ss_dassert(out_codes[i]);
        *out_codes[i] = config_get_compiled_regex(params, keys[i], options,
-                                                    &ovec_size_temp);
+                                                  &ovec_size_temp);
        if (*out_codes[i])
        {
            if (ovec_size_temp > max_ovec_size)