Fix test.bb-10.2-MDEV-22543

1 files changed, 8 insertions, 2 deletions

diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc
index c63f357ad30..a6accd52910 100644
--- a/sql/wsrep_sst.cc
+++ b/sql/wsrep_sst.cc
@@ -192,6 +192,7 @@ bool wsrep_before_SE()
 
 static bool            sst_complete = false;
 static bool            sst_needed   = false;
+static bool            sst_in_progress = false;
 
 #define WSREP_EXTEND_TIMEOUT_INTERVAL 30
 #define WSREP_TIMEDWAIT_SECONDS 10
@@ -1542,7 +1543,10 @@ static void* sst_donor_thread (void* a)
   char         out_buf[out_len];
 
   wsrep_uuid_t  ret_uuid= WSREP_UUID_UNDEFINED;
-  wsrep_seqno_t ret_seqno= WSREP_SEQNO_UNDEFINED; // seqno of complete SST
+  // seqno of complete SST
+  wsrep_seqno_t ret_seqno= WSREP_SEQNO_UNDEFINED;
+  // SST is now in progress
+  sst_in_progress= true;
 
   wsp::thd thd(FALSE); // we turn off wsrep_on for this THD so that it can
                        // operate with wsrep_ready == OFF
@@ -1644,6 +1648,8 @@ wait_signal:
   wsrep->sst_sent (wsrep, &state_id, -err);
   proc.wait();
 
+  sst_in_progress= false;
+
   return NULL;
 }
 
@@ -1821,5 +1827,5 @@ void wsrep_SE_initialized()
 
 bool wsrep_is_sst_progress()
 {
-	return (sst_needed && !sst_complete);
+  return (sst_in_progress);
 }