Merge branch '2.2' into 2.3

2019-03-22 11:32:31 +02:00
parent 5cdba97ec7 3448a36b68
commit fadbdc7514
4 changed files with 182 additions and 21 deletions
--- a/server/core/config_runtime.cc
+++ b/server/core/config_runtime.cc
@ -2738,9 +2738,9 @@ json_t* runtime_get_json_error()
    json_t* obj = NULL;
    std::string errmsg = runtime_get_error();

-    if (errmsg.length())
+    if (!errmsg.empty())
    {
-        obj = mxs_json_error(errmsg.c_str());
+        obj = mxs_json_error("%s", errmsg.c_str());
    }

    return obj;