Merge branch '2.2' into 2.3

2019-03-16 09:30:56 +02:00
parent a3af8ffdd0 fd21bed5aa
commit 4dda31ffe3
1 changed files with 4 additions and 2 deletions
--- a/server/modules/routing/readwritesplit/rwsplitsession.cc
+++ b/server/modules/routing/readwritesplit/rwsplitsession.cc
@ -267,8 +267,10 @@ bool RWSplitSession::route_stored_query()
        }
        else
        {
-            /** Routing was stopped, we need to wait for a response before retrying */
-            m_query_queue = gwbuf_append(temp_storage, m_query_queue);
+            /** Routing was stopped, we need to wait for a response before retrying.
+             * temp_storage holds the tail end of the queue and query_queue contains the query we attempted
+             * to route. Append temp_storage to query_queue to keep the order of the queries correct. */
+            m_query_queue = gwbuf_append(m_query_queue, temp_storage);
            break;
        }
    }