Merge branch '2.2' into 2.3

2018-12-17 23:52:56 +02:00
parent 208a1d011e 0b67a22add
commit 35d31801bb
9 changed files with 85 additions and 17 deletions
--- a/server/modules/protocol/MySQL/rwbackend.cc
+++ b/server/modules/protocol/MySQL/rwbackend.cc
@ -104,6 +104,10 @@ bool RWBackend::write(GWBUF* buffer, response_type type)
                // Any non-zero flag value means that we have an open cursor
                m_opening_cursor = flags != 0;
            }
+            else if (cmd == MXS_COM_STMT_CLOSE)
+            {
+                m_ps_handles.erase(it);
+            }
            else if (cmd == MXS_COM_STMT_FETCH)
            {
                // Number of rows to fetch is a 4 byte integer after the ID