Merge branch '2.3' into develop

include/maxscale/buffer.hh

@@ -480,6 +480,42 @@ public:
             return &m_i;
         }
 
+        /**
+         * Advance the iterator
+         *
+         * This provides similar behavior to random access iterators with operator+= but does it in
+         * non-constant time.
+         *
+         * @param i Number of steps to advance the iterator
+         */
+        void advance(int i)
+        {
+            mxb_assert(m_i != m_end);
+            mxb_assert(i >= 0);
+
+            while (m_i && m_i + i >= m_end)
+            {
+                i -= m_end - m_i;
+                m_pBuffer = m_pBuffer->next;
+
+                if (m_pBuffer)
+                {
+                    m_i = GWBUF_DATA(m_pBuffer);
+                    m_end = m_i + GWBUF_LENGTH(m_pBuffer);
+                }
+                else
+                {
+                    m_i = NULL;
+                    m_end = NULL;
+                }
+            }
+
+            if (m_i)
+            {
+                m_i += i;
+            }
+        }
+
     protected:
         iterator_base(buf_type pBuffer = NULL)
             : m_pBuffer(pBuffer)

server/modules/protocol/MySQL/rwbackend.cc

@@ -204,19 +204,19 @@ Iter skip_encoded_int(Iter it)
     switch (*it)
     {
     case 0xfc:
-        std::advance(it, 3);
+        it.advance(3);
         break;
 
     case 0xfd:
-        std::advance(it, 4);
+        it.advance(4);
         break;
 
     case 0xfe:
-        std::advance(it, 9);
+        it.advance(9);
         break;
 
     default:
-        std::advance(it, 1);
+        ++it;
         break;
     }
 
@@ -301,7 +301,8 @@ void RWBackend::process_packets(GWBUF* result)
         len |= (*it++) << 16;
         ++it;   // Skip the sequence
         mxb_assert(it != buffer.end());
-        auto end = std::next(it, len);
+        auto end = it;
+        end.advance(len);
         uint8_t cmd = *it;
 
         // Ignore the tail end of a large packet large packet. Only resultsets can generate packets this large