From 20128556d6463e265be7b1e9faf9560070b57cd4 Mon Sep 17 00:00:00 2001
From: Teemu Ollakka <teemu.ollakka@galeracluster.com>
Date: Thu, 29 Aug 2019 14:56:21 +0300
Subject: [PATCH] Restore original thread local storage after releasing
 streaming applier.

In convert_streaming_client_to_applier() the new streaming applier
is created and deleted if the server has been disconnected. However,
releasing streaming applier may modify thread local storage. Call
store_globals() to restore thread local storage before returning.
---
 src/server_state.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server_state.cpp b/src/server_state.cpp
index bd8d9de..cde28ea 100644
--- a/src/server_state.cpp
+++ b/src/server_state.cpp
@@ -1170,6 +1170,7 @@ void wsrep::server_state::convert_streaming_client_to_applier(
     else
     {
         server_service_.release_high_priority_service(streaming_applier);
+        client_state->client_service().store_globals();
     }
 }