Merge branch '2.3' into 2.4

2019-10-10 21:42:43 +03:00
parent c2fc541ea4 183673b026
commit dc895e41ad
12 changed files with 854 additions and 231 deletions
--- a/include/maxscale/resultset.hh
+++ b/include/maxscale/resultset.hh
@ -64,4 +64,5 @@ private:
    std::vector<std::vector<std::string>> m_rows;

    ResultSet(std::initializer_list<std::string> names);
+    json_t* get_json_value(const std::string& s);
 };