Merge branch '2.3' into 2.4

2019-07-28 21:43:58 +03:00
parent d4b712ae84 918a2964d5
commit a9b01ff4cc
20 changed files with 199 additions and 34 deletions
--- a/server/modules/protocol/MySQL/rwbackend.cc
+++ b/server/modules/protocol/MySQL/rwbackend.cc
@ -304,6 +304,7 @@ void RWBackend::process_packets(GWBUF* result)
    auto it = buffer.begin();
    MXB_AT_DEBUG(size_t total_len = buffer.length());
    MXB_AT_DEBUG(size_t used_len = 0);
+    mxb_assert(dcb()->session->service->capabilities & (RCAP_TYPE_PACKET_OUTPUT | RCAP_TYPE_STMT_OUTPUT));

    while (it != buffer.end())
    {