Merge branch '2.1' into 2.2

2017-09-27 13:04:14 +03:00
parent 2633ad2fe4 e97f26f170
commit 7b6680b8fa
6 changed files with 70 additions and 18 deletions
--- a/server/core/externcmd.cc
+++ b/server/core/externcmd.cc
@ -381,6 +381,7 @@ bool externcmd_substitute_arg(EXTERNCMD* cmd, const char* match, const char* rep
            if (dest)
            {
                mxs_pcre2_result_t rc = mxs_pcre2_substitute(re, cmd->argv[i], replace, &dest, &size);
+
                switch (rc)
                {
                case MXS_PCRE2_ERROR: