Merge branch '2.3' into develop

2019-06-03 13:46:13 +03:00
parent 625741d8ba c219187a1e
commit 44d1b821c3
24 changed files with 357 additions and 57 deletions
--- a/maxscale-system-test/mariadb_func.h
+++ b/maxscale-system-test/mariadb_func.h
@ -348,6 +348,11 @@ public:
        m_pw = pw;
    }

+    uint32_t thread_id() const
+    {
+        return mysql_thread_id(m_conn);
+    }
+
 private:
    std::string m_host;
    int         m_port;