Merge branch '2.3' into develop

2019-03-28 14:28:48 +02:00
parent 6bc2c54081 116efb2409
commit 841bdf4d0f
9 changed files with 234 additions and 63 deletions
--- a/include/maxscale/resultset.hh
+++ b/include/maxscale/resultset.hh
@ -52,6 +52,13 @@ public:
     */
    void write(DCB* dcb);

+    /**
+     * Write the result set to a DCB as JSON
+     *
+     * @param dcb DCB where the result set is written
+     */
+    void write_as_json(DCB* dcb);
+
 private:
    std::vector<std::string>              m_columns;
    std::vector<std::vector<std::string>> m_rows;