Merge branch '2.3' into develop

include/maxscale/backend.hh

@@ -330,6 +330,23 @@ public:
     int64_t                       num_selects() const;
     const maxbase::StopWatch&     session_timer() const;
     const maxbase::IntervalTimer& select_timer() const;
+
+    /**
+     * Get verbose status description
+     *
+     * @return A verbose description of the backend's status
+     */
+    std::string get_verbose_status() const;
+
+    /**
+     * Add explanation message to latest close reason
+     *
+     * The message is printed in get_verbose_status() if the backend is closed.
+     *
+     * @param reason The human-readable message
+     */
+    void set_close_reason(const std::string& reason);
+
 private:
     /**
      * Internal state of the backend
@@ -355,8 +372,13 @@ private:
      */
     void set_state(backend_state state);
 
+    // Stringification function
+    static std::string to_string(backend_state state);
 
     bool               m_closed;            /**< True if a connection has been opened and closed */
+    time_t             m_closed_at;         /**< Timestamp when the backend was last closed */
+    std::string        m_close_reason;      /**< Why the backend was closed */
+    time_t             m_opened_at;         /**< Timestamp when the backend was last opened */
     SERVER_REF*        m_backend;           /**< Backend server */
     DCB*               m_dcb;               /**< Backend DCB */
     mxs::Buffer        m_pending_cmd;       /**< Pending commands */

include/maxscale/protocol/mysql.hh

@@ -297,8 +297,11 @@ typedef enum
     MXS_COM_STMT_RESET          = 26,
     MXS_COM_SET_OPTION          = 27,
     MXS_COM_STMT_FETCH          = 28,
+    MXS_COM_DAEMON              = 29,
+    MXS_COM_UNSUPPORTED         = 30,
+    MXS_COM_RESET_CONNECTION    = 31,
     MXS_COM_STMT_BULK_EXECUTE   = 0xfa,
-    MXS_COM_DAEMON,
+    MXS_COM_MULTI               = 0xfe,
     MXS_COM_END
 } mxs_mysql_cmd_t;
 

include/maxscale/queryclassifier.hh

@@ -348,7 +348,8 @@ private:
      */
     bool query_type_is_read_only(uint32_t qtype) const;
 
-    uint32_t get_route_target(uint8_t command, uint32_t qtype, HINT* pHints);
+    void process_routing_hints(HINT* pHints, uint32_t* target);
+    uint32_t get_route_target(uint8_t command, uint32_t qtype);
 
     MXS_SESSION* session() const
     {