Merge branch '2.2' into develop

2018-07-03 21:13:41 +03:00
parent b98c0841b4 fb1c28c702
commit 44ef4912e8
41 changed files with 233 additions and 110032 deletions
--- a/server/core/internal/routingworker.hh
+++ b/server/core/internal/routingworker.hh
@ -271,6 +271,13 @@ public:
     */
    static int64_t get_one_statistic(POLL_STAT what);

+    /**
+     * Get next worker
+     *
+     * @return The worker where work should be assigned
+     */
+    static RoutingWorker* pick_worker();
+
 private:
    const int    m_id;       /*< The id of the worker. */
    SessionsById m_sessions; /*< A mapping of session_id->MXS_SESSION. The map