Merge commit '09cb4a885f88d30b5108d215dcdaa5163229a230' into develop

2019-04-04 14:34:17 +03:00
parent f812302d62 09cb4a885f
commit 2aa3515fc8
92 changed files with 1560 additions and 1696 deletions
--- a/server/modules/routing/readwritesplit/rwsplitsession.hh
+++ b/server/modules/routing/readwritesplit/rwsplitsession.hh
@ -270,10 +270,9 @@ private:

    inline bool can_route_queries() const
    {
-        return m_query_queue.empty()
-               && (m_expected_responses == 0
-                   || m_qc.load_data_state() == mxs::QueryClassifier::LOAD_DATA_ACTIVE
-                   || m_qc.large_query());
+        return m_expected_responses == 0
+               || m_qc.load_data_state() == mxs::QueryClassifier::LOAD_DATA_ACTIVE
+               || m_qc.large_query();
    }

    inline mxs::QueryClassifier::current_target_t get_current_target() const