From 922ce579c7fd444f43d9061432a620aa0d213e7d Mon Sep 17 00:00:00 2001
From: Teemu Ollakka <teemu.ollakka@galeracluster.com>
Date: Wed, 11 Sep 2019 12:17:15 +0300
Subject: [PATCH] Clear NBO meta on failure, reset current error status after
 command.

---
 src/client_state.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/client_state.cpp b/src/client_state.cpp
index 3655d38..1b22b1d 100644
--- a/src/client_state.cpp
+++ b/src/client_state.cpp
@@ -187,6 +187,7 @@ void wsrep::client_state::after_command_after_result()
     else if (transaction_.active() == false)
     {
         current_error_ = wsrep::e_success;
+        current_error_status_ = wsrep::provider::success;
     }
     sync_wait_gtid_ = wsrep::gtid::undefined();
     state(lock, s_idle);
@@ -632,6 +633,7 @@ int wsrep::client_state::begin_nbo_phase_two(
         // the operation cannot be ended in total order, so we end the
         // NBO mode and let the DBMS to deal with the error.
         mode(lock, m_local);
+        nbo_meta_ = wsrep::ws_meta();
         ret= 1;
         break;
     }