Merge branch '2.3' into develop

2019-02-01 13:55:54 +02:00
parent 968743f61a 08dd55a26a
commit 6038f1f386
31 changed files with 743 additions and 175 deletions
--- a/include/maxscale/queryclassifier.hh
+++ b/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
    {