Merge branch '2.2' into develop

2018-06-25 09:34:55 +03:00
parent f308dd281a 82af399fb1
commit b8e0c31872
7 changed files with 66 additions and 129 deletions
--- a/server/core/session_command.cc
+++ b/server/core/session_command.cc
@ -77,6 +77,11 @@ std::string SessionCommand::to_string()
    /** TODO: Create C++ versions of modutil functions  */
    GWBUF *buf = m_buffer.release();

+    if (!GWBUF_IS_CONTIGUOUS(buf))
+    {
+        buf = gwbuf_make_contiguous(buf);
+    }
+
    if (modutil_extract_SQL(buf, &sql, &sql_len))
    {
        str.append(sql, sql_len);