From 16cc3cd64bd9be99d5d9802aeec2456612f649c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Wed, 14 Aug 2019 14:19:47 +0300
Subject: [PATCH] Fix negative expected response count on trx rollback

The expected reply count should only be decremented on success.
---
 server/modules/routing/readwritesplit/rwsplitsession.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/modules/routing/readwritesplit/rwsplitsession.cc b/server/modules/routing/readwritesplit/rwsplitsession.cc
index 767981308..886ed5c92 100644
--- a/server/modules/routing/readwritesplit/rwsplitsession.cc
+++ b/server/modules/routing/readwritesplit/rwsplitsession.cc
@@ -606,7 +606,6 @@ bool RWSplitSession::handle_ignorable_error(RWBackend* backend)
     mxb_assert(m_expected_responses > 0);
 
     bool ok = false;
-    m_expected_responses--;
 
     MXS_INFO("%s: %s", backend->error().is_rollback() ?
              "Server triggered transaction rollback, replaying transaction" :
@@ -636,6 +635,7 @@ bool RWSplitSession::handle_ignorable_error(RWBackend* backend)
 
     if (ok)
     {
+        m_expected_responses--;
         session_reset_server_bookkeeping(m_pSession);
     }