Merge branch '2.2' into develop

2018-06-08 11:30:55 +03:00
parent 8afa8c2c5a a7dd2127d6
commit 0d73530ff3
44 changed files with 274 additions and 182 deletions
--- a/server/modules/routing/readwritesplit/rwsplitsession.cc
+++ b/server/modules/routing/readwritesplit/rwsplitsession.cc
@ -353,6 +353,7 @@ static void log_unexpected_response(SRWBackend& backend, GWBUF* buffer, GWBUF* c
                  "server '%s' when no response was expected. Command: 0x%02hhx "
                  "Query: %s", mxs_mysql_get_command(buffer), backend->name(),
                  backend->current_command(), sql.c_str());
+        session_dump_statements(backend->dcb()->session);
        ss_dassert(false);
    }
 }